From 7ef1710741d3eba0299442c4a18a4f05c7967ba7 Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Wed, 7 Oct 2026 21:31:33 +0200 Subject: [PATCH 01/16] refactor: render border points table as HTML instead of markdown --- .../_partials/helper/borderPointsRefs.html | 7 +++- .../_partials/helper/borderPointsRows.html | 11 +++--- .../helper/borderPointsSideLabel.html | 6 ++-- .../_partials/helper/borderPointsTable.html | 34 +++++++++++++++++++ layouts/_shortcodes/border-points.html | 31 +++-------------- 5 files changed, 55 insertions(+), 34 deletions(-) create mode 100644 layouts/_partials/helper/borderPointsTable.html diff --git a/layouts/_partials/helper/borderPointsRefs.html b/layouts/_partials/helper/borderPointsRefs.html index 413af0509..7d0ad8953 100644 --- a/layouts/_partials/helper/borderPointsRefs.html +++ b/layouts/_partials/helper/borderPointsRefs.html @@ -1,4 +1,5 @@ {{- $prefix := .prefix -}} +{{- $page := .page -}} {{- $out := slice -}} {{- range .items -}} {{- $id := .id -}} @@ -11,7 +12,11 @@ {{- end -}} {{- end -}} {{- with $label -}} - {{- $out = $out | append (cond (ne $ref "") (printf "[%s](%s)" . $ref) .) -}} + {{- if $ref -}} + {{- $out = $out | append (partial "link" (dict "Destination" $ref "Text" . "Page" $page)) -}} + {{- else -}} + {{- $out = $out | append . -}} + {{- end -}} {{- end -}} {{- end -}} {{- return $out -}} diff --git a/layouts/_partials/helper/borderPointsRows.html b/layouts/_partials/helper/borderPointsRows.html index b3370859f..5a4fc9c85 100644 --- a/layouts/_partials/helper/borderPointsRows.html +++ b/layouts/_partials/helper/borderPointsRows.html @@ -1,4 +1,5 @@ {{- $country := .country -}} +{{- $page := .page -}} {{- $data := partialCached "helper/borderPoints" . site.Language.Lang -}} {{- $borders := $data.borders | default slice -}} @@ -26,14 +27,14 @@ {{- with $own -}} {{- $other := cond (eq . "a") "b" "a" -}} - {{- $names := $border.points | default slice -}} + {{- $points := $border.points | default slice -}} {{- if $border.sort -}} - {{- $names = sort $names -}} + {{- $points = sort $points -}} {{- end -}} - {{- with $names -}} + {{- with $points -}} {{- $rows = $rows | append (dict - "label" (partial "helper/borderPointsSideLabel" (index $border $other)) - "points" (delimit . ", ")) + "label" (partial "helper/borderPointsSideLabel" (dict "side" (index $border $other) "page" $page)) + "points" .) -}} {{- end -}} {{- end -}} diff --git a/layouts/_partials/helper/borderPointsSideLabel.html b/layouts/_partials/helper/borderPointsSideLabel.html index 50f467edd..4597a47e4 100644 --- a/layouts/_partials/helper/borderPointsSideLabel.html +++ b/layouts/_partials/helper/borderPointsSideLabel.html @@ -1,5 +1,7 @@ -{{- $countries := partial "helper/borderPointsRefs" (dict "prefix" "country" "items" .countries) -}} -{{- $operators := partial "helper/borderPointsRefs" (dict "prefix" "operator" "items" .operators) -}} +{{- $side := .side -}} +{{- $page := .page -}} +{{- $countries := partial "helper/borderPointsRefs" (dict "prefix" "country" "items" $side.countries "page" $page) -}} +{{- $operators := partial "helper/borderPointsRefs" (dict "prefix" "operator" "items" $side.operators "page" $page) -}} {{- $out := delimit $countries ", " -}} {{- with $operators -}} diff --git a/layouts/_partials/helper/borderPointsTable.html b/layouts/_partials/helper/borderPointsTable.html new file mode 100644 index 000000000..1534ff421 --- /dev/null +++ b/layouts/_partials/helper/borderPointsTable.html @@ -0,0 +1,34 @@ +{{- $country := .country -}} +{{- $page := .page -}} +{{- $data := partialCached "helper/borderPoints" . site.Language.Lang -}} +{{- $rows := partial "helper/borderPointsRows" . -}} + +{{- with $rows -}} + + + + + + + + + {{- range . }} + + + + + {{- end }} + +
{{ T "borderPoints.country" }}{{ T "borderPoints.points" }}
{{ .label | safeHTML }}{{ delimit .points ", " }}
+ + {{- range where ($data.countries | default slice) "id" $country -}} + {{- with .footnotes -}} +

+ {{- range $index, $footnote := . -}} + {{- if $index }}
{{ end -}} + {{ $footnote }} + {{- end -}} +

+ {{- end -}} + {{- end -}} +{{- end -}} diff --git a/layouts/_shortcodes/border-points.html b/layouts/_shortcodes/border-points.html index fba58b2dc..bb1b654b2 100644 --- a/layouts/_shortcodes/border-points.html +++ b/layouts/_shortcodes/border-points.html @@ -1,27 +1,6 @@ -{{- $country := .Page.Params.country -}} -{{- $data := partialCached "helper/borderPoints" . site.Language.Lang -}} -{{- $rows := partial "helper/borderPointsRows" (dict "country" $country) -}} - -{{- $lines := slice - (printf "| %s | %s |" (T "borderPoints.country") (T "borderPoints.points")) - "| --- | --- |" +{{- partial "expander" (dict + "Title" (T "borderPoints.title") + "Variant" "border" + "Content" (partial "helper/borderPointsTable" (dict "country" .Page.Params.country "page" .Page) | safeHTML) + ) -}} -{{- range $rows -}} - {{- $lines = $lines | append (printf "| %s | %s |" .label .points) -}} -{{- end -}} - -{{- $markdown := delimit $lines "\n" -}} -{{- range where ($data.countries | default slice) "id" $country -}} - {{- with .footnotes -}} - {{- $markdown = printf "%s\n\n%s" $markdown (delimit . "\\\n") -}} - {{- end -}} -{{- end -}} - -{{- with $rows -}} - {{- partial "expander" (dict - "Title" (T "borderPoints.title") - "Variant" "border" - "Content" ($.Page.RenderString (dict "display" "block") $markdown) - ) - -}} -{{- end -}} From 1a20b0daf03dd926922a12d53324fdd34f9f1b22 Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Wed, 7 Oct 2026 21:37:29 +0200 Subject: [PATCH 02/16] refactor: use country ids as map keys in borderpoints data --- content/country/borderpoints.de.yaml | 54 +++++++++---------- content/country/borderpoints.en.yaml | 54 +++++++++---------- content/country/borderpoints.fr.yaml | 54 +++++++++---------- .../_partials/helper/borderPointsRows.html | 2 +- .../_partials/helper/borderPointsTable.html | 2 +- 5 files changed, 83 insertions(+), 83 deletions(-) diff --git a/content/country/borderpoints.de.yaml b/content/country/borderpoints.de.yaml index 422a34323..514365a8c 100644 --- a/content/country/borderpoints.de.yaml +++ b/content/country/borderpoints.de.yaml @@ -1,19 +1,19 @@ countries: - - id: austria + austria: order: [at-cz, at-sk, at-hu-gysev, at-hu-mav, at-si, at-it, at-ch, at-de] - - id: belgium + belgium: order: [be-nl, be-de, be-lu, be-fr] - - id: bosnia-and-herzegovina + bosnia-and-herzegovina: order: [ba-hr, ba-rs] - - id: bulgaria + bulgaria: order: [bg-ro, bg-tr, bg-gr, bg-rs] - - id: czechia + czechia: order: [cz-pl, cz-sk, at-cz, cz-de] - - id: denmark + denmark: order: [dk-se, dk-de] - - id: france + france: order: [fr-eurostar, be-fr, lu-fr, de-fr, fr-ch, fr-it, es-fr] - - id: germany + germany: order: [ dk-de, @@ -31,12 +31,12 @@ countries: ] footnotes: - "MS = Mitte See" - - id: greece + greece: order: [gr-mk, bg-gr, gr-tr, gr-it] footnotes: - "[>] = In Richtung (z. B. Patras [> Ancona] = Patras ist der Grenzpunkt in Richtung Ancona)" - - id: hungary + hungary: order: [ hu-sk-mav, @@ -49,49 +49,49 @@ countries: at-hu-mav, at-hu-gysev, ] - - id: ireland + ireland: order: [ie-gb-rail, ie-gb-sll] - - id: italy + italy: order: [at-it, it-si, gr-it, fr-it, it-ch] footnotes: - "[>] = In Richtung (z. B. Domodossola [> Locarno] = Domodossola ist der Grenzpunkt in Richtung Locarno)" - - id: latvia + latvia: order: [lv-ee, lv-ru, lv-by, lv-lt] - - id: lithuania + lithuania: order: [lv-lt, lt-by, lt-pl, lt-ru] - - id: luxembourg + luxembourg: order: [be-lu, de-lu, lu-fr] - - id: montenegro + montenegro: order: [me-rs] - - id: netherlands + netherlands: order: [de-nl, be-nl, nl-gb-stl] - - id: norway + norway: order: [no-se] - - id: poland + poland: order: [pl-ru, lt-pl, pl-by, pl-ua, pl-sk, cz-pl, de-pl] - - id: portugal + portugal: order: [pt-es] footnotes: - "[>] = In Richtung (z. B. V. Real de Sto António Guardiana [> Ayamonte] = V. Real de Sto António Guardiana ist der Grenzpunkt in Richtung Ayamonte)" - - id: romania + romania: order: [ro-ua, ro-md, bg-ro, ro-rs, hu-ro] - - id: serbia + serbia: order: [hu-rs, ro-rs, bg-rs, rs-mk, me-rs, ba-rs, rs-hr] - - id: slovakia + slovakia: order: [hu-sk-gysev, hu-sk-mav, cz-sk] - - id: slovenia + slovenia: order: [it-si, si-hr, at-si, hu-si] - - id: spain + spain: order: [pt-es, es-fr] - - id: switzerland + switzerland: order: [de-ch, at-ch, it-ch, fr-ch] footnotes: - "[>] = In Richtung (z. B. Locarno [> Domodossola] = Locarno ist der Grenzpunkt in Richtung Domodossola)" - - id: united-kingdom + united-kingdom: order: [nl-gb-stl, gb-eurostar, ie-gb-rail, ie-gb-sll, gb-gb-sll] borders: diff --git a/content/country/borderpoints.en.yaml b/content/country/borderpoints.en.yaml index a0d6e2ffa..8333e65c8 100644 --- a/content/country/borderpoints.en.yaml +++ b/content/country/borderpoints.en.yaml @@ -1,19 +1,19 @@ countries: - - id: austria + austria: order: [at-cz, at-sk, at-hu-gysev, at-hu-mav, at-si, at-it, at-ch, at-de] - - id: belgium + belgium: order: [be-nl, be-de, be-lu, be-fr] - - id: bosnia-and-herzegovina + bosnia-and-herzegovina: order: [ba-hr, ba-rs] - - id: bulgaria + bulgaria: order: [bg-ro, bg-tr, bg-gr, bg-rs] - - id: czechia + czechia: order: [cz-pl, cz-sk, at-cz, cz-de] - - id: denmark + denmark: order: [dk-se, dk-de] - - id: france + france: order: [fr-eurostar, be-fr, lu-fr, de-fr, fr-ch, fr-it, es-fr] - - id: germany + germany: order: [ dk-de, @@ -31,12 +31,12 @@ countries: ] footnotes: - "MS = Middle of the lake" - - id: greece + greece: order: [gr-mk, bg-gr, gr-tr, gr-it] footnotes: - "[>] = In the direction of (e.g. Patras [> Ancona] = Patras is the border point in the direction of Ancona)" - - id: hungary + hungary: order: [ hu-sk-mav, @@ -49,49 +49,49 @@ countries: at-hu-mav, at-hu-gysev, ] - - id: ireland + ireland: order: [ie-gb-rail, ie-gb-sll] - - id: italy + italy: order: [at-it, it-si, gr-it, fr-it, it-ch] footnotes: - "[>] = Towards (e.g., Domodossola [> Locarno] = Domodossola is the border point towards Locarno)" - - id: latvia + latvia: order: [lv-ee, lv-ru, lv-by, lv-lt] - - id: lithuania + lithuania: order: [lv-lt, lt-by, lt-pl, lt-ru] - - id: luxembourg + luxembourg: order: [be-lu, de-lu, lu-fr] - - id: montenegro + montenegro: order: [me-rs] - - id: netherlands + netherlands: order: [de-nl, be-nl, nl-gb-stl] - - id: norway + norway: order: [no-se] - - id: poland + poland: order: [pl-ru, lt-pl, pl-by, pl-ua, pl-sk, cz-pl, de-pl] - - id: portugal + portugal: order: [pt-es] footnotes: - "[>] = Direction (for example: V. Real de Sto António Guardiana [> Ayamonte] = the border point at V. Real de Sto António Guardiana is oriented towards Ayamonte)" - - id: romania + romania: order: [ro-ua, ro-md, bg-ro, ro-rs, hu-ro] - - id: serbia + serbia: order: [hu-rs, ro-rs, bg-rs, rs-mk, me-rs, ba-rs, rs-hr] - - id: slovakia + slovakia: order: [hu-sk-gysev, hu-sk-mav, cz-sk] - - id: slovenia + slovenia: order: [it-si, si-hr, at-si, hu-si] - - id: spain + spain: order: [pt-es, es-fr] - - id: switzerland + switzerland: order: [de-ch, at-ch, it-ch, fr-ch] footnotes: - "[>] = Direction (e.g. Locarno [> Domodossola] = Locarno is the border point towards Domodossola)" - - id: united-kingdom + united-kingdom: order: [nl-gb-stl, gb-eurostar, ie-gb-rail, ie-gb-sll, gb-gb-sll] borders: diff --git a/content/country/borderpoints.fr.yaml b/content/country/borderpoints.fr.yaml index 4dd58588e..213dee272 100644 --- a/content/country/borderpoints.fr.yaml +++ b/content/country/borderpoints.fr.yaml @@ -1,19 +1,19 @@ countries: - - id: austria + austria: order: [at-cz, at-sk, at-hu-gysev, at-hu-mav, at-si, at-it, at-ch, at-de] - - id: belgium + belgium: order: [be-nl, be-de, be-lu, be-fr] - - id: bosnia-and-herzegovina + bosnia-and-herzegovina: order: [ba-hr, ba-rs] - - id: bulgaria + bulgaria: order: [bg-ro, bg-tr, bg-gr, bg-rs] - - id: czechia + czechia: order: [cz-pl, cz-sk, at-cz, cz-de] - - id: denmark + denmark: order: [dk-se, dk-de] - - id: france + france: order: [fr-eurostar, be-fr, lu-fr, de-fr, fr-ch, fr-it, es-fr] - - id: germany + germany: order: [ dk-de, @@ -31,12 +31,12 @@ countries: ] footnotes: - "MS = Milieu du lac" - - id: greece + greece: order: [gr-mk, bg-gr, gr-tr, gr-it] footnotes: - "[>] = En direction de (par ex. Patras [> Ancona] = Patras est le point frontière en direction d’Ancona)" - - id: hungary + hungary: order: [ hu-sk-mav, @@ -49,49 +49,49 @@ countries: at-hu-mav, at-hu-gysev, ] - - id: ireland + ireland: order: [ie-gb-rail, ie-gb-sll] - - id: italy + italy: order: [at-it, it-si, gr-it, fr-it, it-ch] footnotes: - "[>] = Vers (par exemple, Domodossola [> Locarno] = Domodossola est le point frontière vers Locarno)" - - id: latvia + latvia: order: [lv-ee, lv-ru, lv-by, lv-lt] - - id: lithuania + lithuania: order: [lv-lt, lt-by, lt-pl, lt-ru] - - id: luxembourg + luxembourg: order: [be-lu, de-lu, lu-fr] - - id: montenegro + montenegro: order: [me-rs] - - id: netherlands + netherlands: order: [de-nl, be-nl, nl-gb-stl] - - id: norway + norway: order: [no-se] - - id: poland + poland: order: [pl-ru, lt-pl, pl-by, pl-ua, pl-sk, cz-pl, de-pl] - - id: portugal + portugal: order: [pt-es] footnotes: - "[>] = Direction (par exemple : V. Real de Sto António Guardiana [> Ayamonte] = le point frontalier à V. Real de Sto António Guardiana est orienté vers Ayamonte)" - - id: romania + romania: order: [ro-ua, ro-md, bg-ro, ro-rs, hu-ro] - - id: serbia + serbia: order: [hu-rs, ro-rs, bg-rs, rs-mk, me-rs, ba-rs, rs-hr] - - id: slovakia + slovakia: order: [hu-sk-gysev, hu-sk-mav, cz-sk] - - id: slovenia + slovenia: order: [it-si, si-hr, at-si, hu-si] - - id: spain + spain: order: [pt-es, es-fr] - - id: switzerland + switzerland: order: [de-ch, at-ch, it-ch, fr-ch] footnotes: - "[>] = En direction de (par exemple, Locarno [> Domodossola] = Locarno est le point frontière en direction de Domodossola)" - - id: united-kingdom + united-kingdom: order: [nl-gb-stl, gb-eurostar, ie-gb-rail, ie-gb-sll, gb-gb-sll] borders: diff --git a/layouts/_partials/helper/borderPointsRows.html b/layouts/_partials/helper/borderPointsRows.html index 5a4fc9c85..529acfadc 100644 --- a/layouts/_partials/helper/borderPointsRows.html +++ b/layouts/_partials/helper/borderPointsRows.html @@ -4,7 +4,7 @@ {{- $borders := $data.borders | default slice -}} {{- $ordered := $borders -}} -{{- range where ($data.countries | default slice) "id" $country -}} +{{- with index $data.countries $country -}} {{- with .order -}} {{- $ordered = slice -}} {{- range . -}} diff --git a/layouts/_partials/helper/borderPointsTable.html b/layouts/_partials/helper/borderPointsTable.html index 1534ff421..e191d6e30 100644 --- a/layouts/_partials/helper/borderPointsTable.html +++ b/layouts/_partials/helper/borderPointsTable.html @@ -21,7 +21,7 @@ - {{- range where ($data.countries | default slice) "id" $country -}} + {{- with index $data.countries $country -}} {{- with .footnotes -}}

{{- range $index, $footnote := . -}} From 74818d9df0b1183685224c12dd5fbb732d7ccc7a Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Wed, 7 Oct 2026 21:48:43 +0200 Subject: [PATCH 03/16] feat: add shortName to operator frontmatter, simplify borderpoints operators --- content/country/borderpoints.de.yaml | 256 ++++++++---------- content/country/borderpoints.en.yaml | 256 ++++++++---------- content/country/borderpoints.fr.yaml | 256 ++++++++---------- content/operator/attica/index.de.md | 1 + content/operator/attica/index.en.md | 1 + content/operator/attica/index.fr.md | 1 + content/operator/bdz/index.de.md | 1 + content/operator/bdz/index.en.md | 1 + content/operator/bdz/index.fr.md | 1 + content/operator/bls/index.de.md | 1 + content/operator/bls/index.en.md | 1 + content/operator/bls/index.fr.md | 1 + content/operator/bsb/index.de.md | 1 + content/operator/bsb/index.en.md | 1 + content/operator/bsb/index.fr.md | 1 + content/operator/cd/index.de.md | 1 + content/operator/cd/index.en.md | 1 + content/operator/cd/index.fr.md | 1 + content/operator/cfl/index.de.md | 1 + content/operator/cfl/index.en.md | 1 + content/operator/cfl/index.fr.md | 1 + content/operator/cfr/index.de.md | 1 + content/operator/cfr/index.en.md | 1 + content/operator/cfr/index.fr.md | 1 + content/operator/cie/index.de.md | 1 + content/operator/cie/index.en.md | 1 + content/operator/cie/index.fr.md | 1 + content/operator/cp/index.de.md | 1 + content/operator/cp/index.en.md | 1 + content/operator/cp/index.fr.md | 1 + content/operator/db/index.de.md | 1 + content/operator/db/index.en.md | 1 + content/operator/db/index.fr.md | 1 + content/operator/dsb/index.de.md | 1 + content/operator/dsb/index.en.md | 1 + content/operator/dsb/index.fr.md | 1 + content/operator/eurostar/index.de.md | 1 + content/operator/eurostar/index.en.md | 1 + content/operator/eurostar/index.fr.md | 1 + content/operator/fs/index.de.md | 1 + content/operator/fs/index.en.md | 1 + content/operator/fs/index.fr.md | 1 + content/operator/gb/index.de.md | 1 + content/operator/gb/index.en.md | 1 + content/operator/gb/index.fr.md | 1 + content/operator/gysev/index.de.md | 1 + content/operator/gysev/index.en.md | 1 + content/operator/gysev/index.fr.md | 1 + content/operator/ht/index.de.md | 1 + content/operator/ht/index.en.md | 1 + content/operator/ht/index.fr.md | 1 + content/operator/kd/index.de.md | 1 + content/operator/kd/index.en.md | 1 + content/operator/kd/index.fr.md | 1 + content/operator/ks/index.de.md | 1 + content/operator/ks/index.en.md | 1 + content/operator/ks/index.fr.md | 1 + content/operator/ltg/index.de.md | 1 + content/operator/ltg/index.en.md | 1 + content/operator/ltg/index.fr.md | 1 + content/operator/mav/index.de.md | 1 + content/operator/mav/index.en.md | 1 + content/operator/mav/index.fr.md | 1 + content/operator/nir/index.de.md | 1 + content/operator/nir/index.en.md | 1 + content/operator/nir/index.fr.md | 1 + content/operator/ns/index.de.md | 1 + content/operator/ns/index.en.md | 1 + content/operator/ns/index.fr.md | 1 + content/operator/oebb/index.de.md | 1 + content/operator/oebb/index.en.md | 1 + content/operator/oebb/index.fr.md | 1 + content/operator/pkp/index.de.md | 1 + content/operator/pkp/index.en.md | 1 + content/operator/pkp/index.fr.md | 1 + content/operator/renfe/index.de.md | 1 + content/operator/renfe/index.en.md | 1 + content/operator/renfe/index.fr.md | 1 + content/operator/sbb/index.de.md | 1 + content/operator/sbb/index.en.md | 1 + content/operator/sbb/index.fr.md | 1 + content/operator/sll/index.de.md | 1 + content/operator/sll/index.en.md | 1 + content/operator/sll/index.fr.md | 1 + content/operator/sncb/index.de.md | 1 + content/operator/sncb/index.en.md | 1 + content/operator/sncb/index.fr.md | 1 + content/operator/sncf/index.de.md | 1 + content/operator/sncf/index.en.md | 1 + content/operator/sncf/index.fr.md | 1 + content/operator/sp/index.de.md | 1 + content/operator/sp/index.en.md | 1 + content/operator/sp/index.fr.md | 1 + content/operator/stl/index.de.md | 1 + content/operator/stl/index.en.md | 1 + content/operator/stl/index.fr.md | 1 + content/operator/sv/index.de.md | 1 + content/operator/sv/index.en.md | 1 + content/operator/sv/index.fr.md | 1 + content/operator/sz/index.de.md | 1 + content/operator/sz/index.en.md | 1 + content/operator/sz/index.fr.md | 1 + content/operator/vy/index.de.md | 1 + content/operator/vy/index.en.md | 1 + content/operator/vy/index.fr.md | 1 + content/operator/zfbh/index.de.md | 1 + content/operator/zfbh/index.en.md | 1 + content/operator/zfbh/index.fr.md | 1 + content/operator/zpcg/index.de.md | 1 + content/operator/zpcg/index.en.md | 1 + content/operator/zpcg/index.fr.md | 1 + content/operator/zrs/index.de.md | 1 + content/operator/zrs/index.en.md | 1 + content/operator/zrs/index.fr.md | 1 + content/operator/zssk/index.de.md | 1 + content/operator/zssk/index.en.md | 1 + content/operator/zssk/index.fr.md | 1 + .../_partials/helper/borderPointsRefs.html | 4 +- layouts/admin/section.cmsconfig.yml | 10 +- 119 files changed, 485 insertions(+), 411 deletions(-) diff --git a/content/country/borderpoints.de.yaml b/content/country/borderpoints.de.yaml index 514365a8c..e61de887a 100644 --- a/content/country/borderpoints.de.yaml +++ b/content/country/borderpoints.de.yaml @@ -98,10 +98,10 @@ borders: - id: at-cz a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: czechia }] - operators: [{ id: cd, label: ČD }] + operators: [{ id: cd }] points: - "Bernhardsthal (Gr) / Břeclav (Gr)" - "Unterretzbach (Gr) / Retz (Gr)" @@ -111,10 +111,10 @@ borders: - id: at-sk a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: slovakia }] - operators: [{ id: zssk, label: ZSSK / ŽSR }] + operators: [{ id: zssk }] points: - "Marchegg (Gr)" - "Kittsee (Gr)" @@ -122,10 +122,10 @@ borders: - id: at-hu-gysev a: countries: [{ id: austria }] - operators: [{ id: gysev, label: GySEV }] + operators: [{ id: gysev }] b: countries: [{ id: hungary }] - operators: [{ id: gysev, label: GySEV }] + operators: [{ id: gysev }] points: - "Pamhagen (Gr)" - "Szentgotthárd" @@ -134,10 +134,10 @@ borders: - id: at-hu-mav a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }] + operators: [{ id: mav }] points: - "Hegyeshalom (Gr)" - "Sopron" @@ -146,10 +146,10 @@ borders: sort: true a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: slovenia }] - operators: [{ id: sz, label: SŽ }] + operators: [{ id: sz }] points: - "Bleiburg (Gr) (Slowenisch: Pliberk)" - "Spielfeld-Strass (Gr) / Spielfeld (Gr) (Slowenisch: Špilje)" @@ -158,10 +158,10 @@ borders: - id: at-it a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: italy }] - operators: [{ id: fs, label: FS }] + operators: [{ id: fs }] points: - "Brennero/Brenner" - "San Candido/Innichen" @@ -170,10 +170,10 @@ borders: - id: at-ch a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: switzerland }] - operators: [{ id: sbb, label: SBB }] + operators: [{ id: sbb }] points: - "Buchs SG" - "St. Margrethen" @@ -182,10 +182,10 @@ borders: sort: true a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] points: - "Passau Hbf" - "Salzburg Hbf (im NV bis Salzburg Liefering)" @@ -197,10 +197,10 @@ borders: - id: be-nl a: countries: [{ id: belgium }] - operators: [{ id: sncb, label: SNCB }] + operators: [{ id: sncb }] b: countries: [{ id: netherlands }] - operators: [{ id: ns, label: NS }] + operators: [{ id: ns }] points: - "Roosendaal (fr)" - "Visé (fr)" @@ -208,20 +208,20 @@ borders: - id: be-de a: countries: [{ id: belgium }] - operators: [{ id: sncb, label: SNCB }] + operators: [{ id: sncb }] b: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] points: - "Aachen Süd (Gr)" - id: be-lu a: countries: [{ id: belgium }] - operators: [{ id: sncb, label: SNCB }] + operators: [{ id: sncb }] b: countries: [{ id: luxembourg }] - operators: [{ id: cfl, label: CFL }] + operators: [{ id: cfl }] points: - "Athus" - "Gouvy (fr)" @@ -230,10 +230,10 @@ borders: - id: be-fr a: countries: [{ id: belgium }] - operators: [{ id: sncb, label: SNCB }] + operators: [{ id: sncb }] b: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] points: - "Blandain (fr)" - "Givet (fr)" @@ -244,7 +244,7 @@ borders: - id: ba-hr a: countries: [{ id: bosnia-and-herzegovina }] - operators: [{ id: zfbh, label: ŽFBH }, { id: zrs, label: ŽRS }] + operators: [{ id: zfbh }, { id: zrs }] b: countries: [{ label: Kroatien }] operators: [{ label: HŽ }] @@ -258,20 +258,20 @@ borders: - id: ba-rs a: countries: [{ id: bosnia-and-herzegovina }] - operators: [{ id: zfbh, label: ŽFBH }, { id: zrs, label: ŽRS }] + operators: [{ id: zfbh }, { id: zrs }] b: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] points: - "Zvornik" - id: bg-ro a: countries: [{ id: bulgaria }] - operators: [{ id: bdz, label: BDŽ }] + operators: [{ id: bdz }] b: countries: [{ id: romania }] - operators: [{ id: cfr, label: CFR }] + operators: [{ id: cfr }] points: - "Ruse (fr) (bulgarisch: Русе)" - "Vidin (fr)" @@ -279,7 +279,7 @@ borders: - id: bg-tr a: countries: [{ id: bulgaria }] - operators: [{ id: bdz, label: BDŽ }] + operators: [{ id: bdz }] b: countries: [{ label: Türkei }] operators: [{ label: TCDD }] @@ -289,10 +289,10 @@ borders: - id: bg-gr a: countries: [{ id: bulgaria }] - operators: [{ id: bdz, label: BDŽ }] + operators: [{ id: bdz }] b: countries: [{ id: greece }] - operators: [{ id: ht, label: Hellenic Train }] + operators: [{ id: ht }] points: - "Kulata (fr) (bulgarisch: Кулата)" - "Svilengrad (fr) (bulgarisch: Свиленград)" @@ -300,21 +300,20 @@ borders: - id: bg-rs a: countries: [{ id: bulgaria }] - operators: [{ id: bdz, label: BDŽ }] + operators: [{ id: bdz }] b: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] points: - "Dimitrovgrad (fr) (bulgarisch: Цариброд, Tsaribrod)" - id: cz-pl a: countries: [{ id: czechia }] - operators: [{ id: cd, label: ČD }] + operators: [{ id: cd }] b: countries: [{ id: poland }] - operators: - [{ id: pkp, label: PKP }, { id: kd, label: KD }, { id: ks, label: KŚ }] + operators: [{ id: pkp }, { id: kd }, { id: ks }] points: - "Bohumín (Gr)" - "Český Těšín (Gr)" @@ -327,10 +326,10 @@ borders: - id: cz-sk a: countries: [{ id: czechia }] - operators: [{ id: cd, label: ČD }] + operators: [{ id: cd }] b: countries: [{ id: slovakia }] - operators: [{ id: zssk, label: ZSSK / ŽSR }] + operators: [{ id: zssk }] points: - "Čadca (Gr)" - "Hodonín (Gr)" @@ -344,10 +343,10 @@ borders: sort: true a: countries: [{ id: czechia }] - operators: [{ id: cd, label: ČD }] + operators: [{ id: cd }] b: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] points: - "Selb-Plößberg (Gr) / Aš (Gr)" - "Bayerisch Eisenstein (tschechisch: Bavorská Železná ruda)" @@ -366,7 +365,7 @@ borders: - id: dk-se a: countries: [{ id: denmark }] - operators: [{ id: dsb, label: DSB }] + operators: [{ id: dsb }] b: countries: [{ label: Schweden }] operators: [{ label: SJ }] @@ -376,10 +375,10 @@ borders: - id: dk-de a: countries: [{ id: denmark }] - operators: [{ id: dsb, label: DSB }] + operators: [{ id: dsb }] b: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] points: - "Flensburg (Gr)" - "Puttgarden (MS) (über Rødby Faerge)" @@ -389,7 +388,7 @@ borders: - id: de-se a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: countries: [{ label: Schweden }] operators: [{ label: SJ }] @@ -402,10 +401,10 @@ borders: sort: true a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: countries: [{ id: poland }] - operators: [{ id: pkp, label: PKP }] + operators: [{ id: pkp }] points: - "Ahlbeck (Gr)" - "Forst (Gr)" @@ -420,9 +419,9 @@ borders: - id: de-bsb a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: - operators: [{ id: bsb, label: BSB }] + operators: [{ id: bsb }] points: - "Friedrichshafen" - "Langenargen" @@ -435,15 +434,10 @@ borders: - id: de-ch a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: countries: [{ id: switzerland }] - operators: - [ - { id: sbb, label: SBB }, - { id: bls, label: BLS }, - { id: sp, label: SP }, - ] + operators: [{ id: sbb }, { id: bls }, { id: sp }] points: - "Basel Bad Bf" - "Konstanz" @@ -453,10 +447,10 @@ borders: - id: de-fr a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] points: - "Apach (fr)" - "Forbach (fr)" @@ -469,19 +463,19 @@ borders: - id: de-lu a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: countries: [{ id: luxembourg }] - operators: [{ id: cfl, label: CFL }] + operators: [{ id: cfl }] points: - "Igel (Gr)" - id: de-eurostar a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: - operators: [{ id: eurostar, label: Eurostar }] + operators: [{ id: eurostar }] points: - "Aachen" - "Duisburg" @@ -493,10 +487,10 @@ borders: - id: de-nl a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: countries: [{ id: netherlands }] - operators: [{ id: ns, label: NS }] + operators: [{ id: ns }] points: - "Bad Bentheim (Gr)" - "Emmerich (Gr)" @@ -508,7 +502,7 @@ borders: - id: gr-mk a: countries: [{ id: greece }] - operators: [{ id: ht, label: Hellenic Train }] + operators: [{ id: ht }] b: countries: [{ label: Nordmazedonien }] operators: [{ label: ŽRSM }] @@ -518,7 +512,7 @@ borders: - id: gr-tr a: countries: [{ id: greece }] - operators: [{ id: ht, label: Hellenic Train }] + operators: [{ id: ht }] b: countries: [{ label: Türkei }] operators: [{ label: TCDD }] @@ -528,10 +522,10 @@ borders: - id: gr-it a: countries: [{ id: greece }] - operators: [{ id: attica, label: Attica }] + operators: [{ id: attica }] b: countries: [{ id: italy }] - operators: [{ id: attica, label: Attica }] + operators: [{ id: attica }] points: - "Patras (Πάτρα) [>Ancona, >Bari]" - "Ancona [>Igoumenitsa, >Patras]" @@ -540,10 +534,10 @@ borders: - id: hu-sk-mav a: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }] + operators: [{ id: mav }] b: countries: [{ id: slovakia }] - operators: [{ id: zssk, label: ZSSK / ŽSR }] + operators: [{ id: zssk }] points: - "Bánréve (Gr)" - "Čaňa (Gr)" @@ -555,17 +549,17 @@ borders: - id: hu-sk-gysev a: countries: [{ id: hungary }] - operators: [{ id: gysev, label: GySEV }] + operators: [{ id: gysev }] b: countries: [{ id: slovakia }] - operators: [{ id: gysev, label: GySEV }] + operators: [{ id: gysev }] points: - "Rajka (Gr)" - id: hu-ua a: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }] + operators: [{ id: mav }] b: countries: [{ label: Ukraine }] operators: [{ label: UZ }] @@ -575,10 +569,10 @@ borders: - id: hu-ro a: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }] + operators: [{ id: mav }] b: countries: [{ id: romania }] - operators: [{ id: cfr, label: CFR }] + operators: [{ id: cfr }] points: - "Biharkeresztes (fr)" - "Curtici (fr) (ungarisch: Kürtös)" @@ -588,10 +582,10 @@ borders: - id: hu-rs a: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }] + operators: [{ id: mav }] b: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] points: - "Röszke (Gr)" - "Subotica (Gr)" @@ -599,7 +593,7 @@ borders: - id: hu-hr a: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }] + operators: [{ id: mav }] b: countries: [{ label: Kroatien }] operators: [{ label: HŽ }] @@ -611,30 +605,30 @@ borders: - id: hu-si a: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }, { id: gysev, label: GySEV }] + operators: [{ id: mav }, { id: gysev }] b: countries: [{ id: slovenia }] - operators: [{ id: sz, label: SŽ }] + operators: [{ id: sz }] points: - "Hodoš (Gr) (Őrihodos)" - id: ie-gb-rail a: countries: [{ id: ireland }] - operators: [{ id: cie, label: CIE }] + operators: [{ id: cie }] b: countries: [{ id: united-kingdom }] - operators: [{ id: nir, label: NIR }] + operators: [{ id: nir }] points: - "Dundalk" - id: ie-gb-sll a: countries: [{ id: ireland }] - operators: [{ id: sll, label: Stena Line Limited }] + operators: [{ id: sll }] b: countries: [{ id: united-kingdom }] - operators: [{ id: sll, label: Stena Line Limited }] + operators: [{ id: sll }] points: - "Dublin Bay / Holyhead" - "Rosslare / Fishguard" @@ -642,10 +636,10 @@ borders: - id: it-si a: countries: [{ id: italy }] - operators: [{ id: fs, label: FS }] + operators: [{ id: fs }] b: countries: [{ id: slovenia }] - operators: [{ id: sz, label: SŽ }] + operators: [{ id: sz }] points: - "Nova Gorica (fr)" - "Villa Opicina (fr) (Slowenisch: Opčine, Triestisch: Opcina)" @@ -653,10 +647,10 @@ borders: - id: fr-it a: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] b: countries: [{ id: italy }] - operators: [{ id: fs, label: FS }] + operators: [{ id: fs }] points: - "Limone-Confine" - "Modane (fr)" @@ -667,15 +661,10 @@ borders: sort: true a: countries: [{ id: italy }] - operators: [{ id: fs, label: FS }] + operators: [{ id: fs }] b: countries: [{ id: switzerland }] - operators: - [ - { id: sbb, label: SBB }, - { id: bls, label: BLS }, - { id: sp, label: SP }, - ] + operators: [{ id: sbb }, { id: bls }, { id: sp }] points: - "Chiasso" - "Domodossola" @@ -691,15 +680,10 @@ borders: - id: fr-ch a: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] b: countries: [{ id: switzerland }] - operators: - [ - { id: sbb, label: SBB }, - { id: bls, label: BLS }, - { id: sp, label: SP }, - ] + operators: [{ id: sbb }, { id: bls }, { id: sp }] points: - "Annemasse" - "Basel SBB" @@ -713,10 +697,10 @@ borders: - id: lu-fr a: countries: [{ id: luxembourg }] - operators: [{ id: cfl, label: CFL }] + operators: [{ id: cfl }] b: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] points: - "Bettembourg (fr)" - "Rodange (fr)" @@ -724,10 +708,10 @@ borders: - id: es-fr a: countries: [{ id: spain }] - operators: [{ id: renfe, label: Renfe }] + operators: [{ id: renfe }] b: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] points: - "Canfranc (fr)" - "Hendaye (fr)" @@ -737,9 +721,9 @@ borders: - id: fr-eurostar a: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] b: - operators: [{ id: eurostar, label: Eurostar }] + operators: [{ id: eurostar }] points: - "Paris" - "Lille" @@ -747,30 +731,30 @@ borders: - id: gb-eurostar a: countries: [{ id: united-kingdom }] - operators: [{ id: gb, label: National Rail }] + operators: [{ id: gb }] b: countries: [{ id: france }, { id: belgium }, { id: netherlands }] - operators: [{ id: eurostar, label: Eurostar }] + operators: [{ id: eurostar }] points: - "London St. Pancras International" - id: nl-gb-stl a: countries: [{ id: netherlands }] - operators: [{ id: stl, label: Stena Line BV }] + operators: [{ id: stl }] b: countries: [{ id: united-kingdom }] - operators: [{ id: stl, label: Stena Line BV }] + operators: [{ id: stl }] points: - "Hoek van Holland / Harwich P.Q." - id: gb-gb-sll a: countries: [{ id: united-kingdom }] - operators: [{ id: sll, label: Stena Line Limited }] + operators: [{ id: sll }] b: countries: [{ id: united-kingdom }] - operators: [{ id: sll, label: Stena Line Limited }] + operators: [{ id: sll }] points: - "Cairnryan" - "Liverpool" @@ -809,14 +793,14 @@ borders: operators: [{ label: LDz }] b: countries: [{ id: lithuania }] - operators: [{ id: ltg, label: LTG-Link }] + operators: [{ id: ltg }] points: - "Joniškis" - id: lt-by a: countries: [{ id: lithuania }] - operators: [{ id: ltg, label: LTG-Link }] + operators: [{ id: ltg }] b: countries: [{ label: Belarus/Weißrussland }] points: @@ -825,17 +809,17 @@ borders: - id: lt-pl a: countries: [{ id: lithuania }] - operators: [{ id: ltg, label: LTG-Link }] + operators: [{ id: ltg }] b: countries: [{ id: poland }] - operators: [{ id: pkp, label: PKP }] + operators: [{ id: pkp }] points: - "Mockava (Gr)" - id: lt-ru a: countries: [{ id: lithuania }] - operators: [{ id: ltg, label: LTG-Link }] + operators: [{ id: ltg }] b: countries: [{ label: Russland }] points: @@ -844,17 +828,17 @@ borders: - id: me-rs a: countries: [{ id: montenegro }] - operators: [{ id: zpcg, label: ŽPCG }] + operators: [{ id: zpcg }] b: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] points: - "Bijelo Polje (Gr)" - id: no-se a: countries: [{ id: norway }] - operators: [{ id: vy, label: Vy }] + operators: [{ id: vy }] b: countries: [{ label: Schweden }] operators: [{ label: SJ }] @@ -867,7 +851,7 @@ borders: - id: pl-ru a: countries: [{ id: poland }] - operators: [{ id: pkp, label: PKP }] + operators: [{ id: pkp }] b: countries: [{ label: Russland }] operators: [{ label: RZD }] @@ -877,7 +861,7 @@ borders: - id: pl-by a: countries: [{ id: poland }] - operators: [{ id: pkp, label: PKP }] + operators: [{ id: pkp }] b: countries: [{ label: Belarus / Weißrussland }] operators: [{ label: BC }] @@ -889,7 +873,7 @@ borders: - id: pl-ua a: countries: [{ id: poland }] - operators: [{ id: pkp, label: PKP }] + operators: [{ id: pkp }] b: countries: [{ label: Ukraine }] operators: [{ label: UZ }] @@ -900,17 +884,17 @@ borders: - id: pl-sk a: countries: [{ id: poland }] - operators: [{ id: pkp, label: PKP }] + operators: [{ id: pkp }] b: countries: [{ id: slovakia }] - operators: [{ id: zssk, label: ZSSK / ŽSR }] + operators: [{ id: zssk }] points: - "Lupkow (Gr)" - id: ro-ua a: countries: [{ id: romania }] - operators: [{ id: cfr, label: CFR }] + operators: [{ id: cfr }] b: countries: [{ label: Ukraine }] operators: [{ label: UZ }] @@ -920,7 +904,7 @@ borders: - id: ro-md a: countries: [{ id: romania }] - operators: [{ id: cfr, label: CFR }] + operators: [{ id: cfr }] b: countries: [{ label: Moldau }] operators: [{ label: CFM }] @@ -931,10 +915,10 @@ borders: - id: ro-rs a: countries: [{ id: romania }] - operators: [{ id: cfr, label: CFR }] + operators: [{ id: cfr }] b: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] points: - "Jimbolia (fr) (serbisch: Жомбољ)" - "Vršac (fr) (serbisch: Вршац)" @@ -942,7 +926,7 @@ borders: - id: rs-mk a: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] b: countries: [{ label: Nordmazedonien }] operators: [{ label: ŽRSM }] @@ -952,7 +936,7 @@ borders: - id: rs-hr a: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] b: countries: [{ label: Kroatien }] operators: [{ label: HŽ }] @@ -963,7 +947,7 @@ borders: - id: si-hr a: countries: [{ id: slovenia }] - operators: [{ id: sz, label: SŽ }] + operators: [{ id: sz }] b: countries: [{ label: Kroatien }] operators: [{ label: HŽ }] @@ -980,10 +964,10 @@ borders: - id: pt-es a: countries: [{ id: portugal }] - operators: [{ id: cp, label: CP }] + operators: [{ id: cp }] b: countries: [{ id: spain }] - operators: [{ id: renfe, label: Renfe }] + operators: [{ id: renfe }] points: - "Badajoz (fr)" - "Barca de Alva (fr)" diff --git a/content/country/borderpoints.en.yaml b/content/country/borderpoints.en.yaml index 8333e65c8..b831dd1e4 100644 --- a/content/country/borderpoints.en.yaml +++ b/content/country/borderpoints.en.yaml @@ -98,10 +98,10 @@ borders: - id: at-cz a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: czechia }] - operators: [{ id: cd, label: ČD }] + operators: [{ id: cd }] points: - "Bernhardsthal (GR) / Břeclav (Gr)" - "Unterretzbach (Gr) / Retz (Gr)" @@ -111,10 +111,10 @@ borders: - id: at-sk a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: slovakia }] - operators: [{ id: zssk, label: ZSSK / ŽSR }] + operators: [{ id: zssk }] points: - "Marchegg (Gr)" - "Kittsee (Gr)" @@ -122,10 +122,10 @@ borders: - id: at-hu-gysev a: countries: [{ id: austria }] - operators: [{ id: gysev, label: GySEV }] + operators: [{ id: gysev }] b: countries: [{ id: hungary }] - operators: [{ id: gysev, label: GySEV }] + operators: [{ id: gysev }] points: - "Pamhagen (Gr)" - "Szentgotthárd" @@ -134,10 +134,10 @@ borders: - id: at-hu-mav a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }] + operators: [{ id: mav }] points: - "Hegyeshalom (Gr)" - "Sopron" @@ -146,10 +146,10 @@ borders: sort: true a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: slovenia }] - operators: [{ id: sz, label: SŽ }] + operators: [{ id: sz }] points: - "Bleiburg (Gr) (Slovenian: Pliberk)" - "Spielfeld-Strass (Gr) / Spielfeld (Gr) (Slovenian: Špilje)" @@ -158,10 +158,10 @@ borders: - id: at-it a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: italy }] - operators: [{ id: fs, label: FS }] + operators: [{ id: fs }] points: - "Brennero/Brenner" - "San Candido/Innichen" @@ -170,10 +170,10 @@ borders: - id: at-ch a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: switzerland }] - operators: [{ id: sbb, label: SBB }] + operators: [{ id: sbb }] points: - "Buchs SG" - "St. Margrethen" @@ -182,10 +182,10 @@ borders: sort: true a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] points: - "Passau Hbf" - "Salzburg Hbf (local trains to Salzburg Liefering)" @@ -197,10 +197,10 @@ borders: - id: be-nl a: countries: [{ id: belgium }] - operators: [{ id: sncb, label: SNCB }] + operators: [{ id: sncb }] b: countries: [{ id: netherlands }] - operators: [{ id: ns, label: NS }] + operators: [{ id: ns }] points: - "Roosendaal (fr)" - "Visé (fr)" @@ -208,20 +208,20 @@ borders: - id: be-de a: countries: [{ id: belgium }] - operators: [{ id: sncb, label: SNCB }] + operators: [{ id: sncb }] b: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] points: - "Aachen Süd (Gr)" - id: be-lu a: countries: [{ id: belgium }] - operators: [{ id: sncb, label: SNCB }] + operators: [{ id: sncb }] b: countries: [{ id: luxembourg }] - operators: [{ id: cfl, label: CFL }] + operators: [{ id: cfl }] points: - "Athus" - "Gouvy (fr)" @@ -230,10 +230,10 @@ borders: - id: be-fr a: countries: [{ id: belgium }] - operators: [{ id: sncb, label: SNCB }] + operators: [{ id: sncb }] b: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] points: - "Blandain (fr)" - "Givet (fr)" @@ -244,7 +244,7 @@ borders: - id: ba-hr a: countries: [{ id: bosnia-and-herzegovina }] - operators: [{ id: zfbh, label: ŽFBH }, { id: zrs, label: ŽRS }] + operators: [{ id: zfbh }, { id: zrs }] b: countries: [{ label: Croatia }] operators: [{ label: HŽ }] @@ -258,20 +258,20 @@ borders: - id: ba-rs a: countries: [{ id: bosnia-and-herzegovina }] - operators: [{ id: zfbh, label: ŽFBH }, { id: zrs, label: ŽRS }] + operators: [{ id: zfbh }, { id: zrs }] b: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] points: - "Zvornik" - id: bg-ro a: countries: [{ id: bulgaria }] - operators: [{ id: bdz, label: BDŽ }] + operators: [{ id: bdz }] b: countries: [{ id: romania }] - operators: [{ id: cfr, label: CFR }] + operators: [{ id: cfr }] points: - "Ruse (fr) (Bulgarian: Русе)" - "Vidin (fr)" @@ -279,7 +279,7 @@ borders: - id: bg-tr a: countries: [{ id: bulgaria }] - operators: [{ id: bdz, label: BDŽ }] + operators: [{ id: bdz }] b: countries: [{ label: Turkey }] operators: [{ label: TCDD }] @@ -289,10 +289,10 @@ borders: - id: bg-gr a: countries: [{ id: bulgaria }] - operators: [{ id: bdz, label: BDŽ }] + operators: [{ id: bdz }] b: countries: [{ id: greece }] - operators: [{ id: ht, label: Hellenic Train }] + operators: [{ id: ht }] points: - "Kulata (fr) (Bulgarian: Кулата)" - "Svilengrad (fr) (Bulgarian: Свиленград)" @@ -300,21 +300,20 @@ borders: - id: bg-rs a: countries: [{ id: bulgaria }] - operators: [{ id: bdz, label: BDŽ }] + operators: [{ id: bdz }] b: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] points: - "Dimitrovgrad (fr) (Bulgarian: Цариброд, Tsaribrod)" - id: cz-pl a: countries: [{ id: czechia }] - operators: [{ id: cd, label: ČD }] + operators: [{ id: cd }] b: countries: [{ id: poland }] - operators: - [{ id: pkp, label: PKP }, { id: kd, label: KD }, { id: ks, label: KŚ }] + operators: [{ id: pkp }, { id: kd }, { id: ks }] points: - "Bohumín (Gr)" - "Český Těšín (Gr)" @@ -327,10 +326,10 @@ borders: - id: cz-sk a: countries: [{ id: czechia }] - operators: [{ id: cd, label: ČD }] + operators: [{ id: cd }] b: countries: [{ id: slovakia }] - operators: [{ id: zssk, label: ZSSK / ŽSR }] + operators: [{ id: zssk }] points: - "Čadca (Gr)" - "Hodonín (Gr)" @@ -344,10 +343,10 @@ borders: sort: true a: countries: [{ id: czechia }] - operators: [{ id: cd, label: ČD }] + operators: [{ id: cd }] b: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] points: - "Selb-Plößberg(Gr) / Aš (Gr)" - "Bayerisch Eisenstein (Czech: Bavorská Železná ruda)" @@ -366,7 +365,7 @@ borders: - id: dk-se a: countries: [{ id: denmark }] - operators: [{ id: dsb, label: DSB }] + operators: [{ id: dsb }] b: countries: [{ label: Sweden }] operators: [{ label: SJ }] @@ -376,10 +375,10 @@ borders: - id: dk-de a: countries: [{ id: denmark }] - operators: [{ id: dsb, label: DSB }] + operators: [{ id: dsb }] b: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] points: - "Flensburg (Gr)" - "Puttgarden (MS) (via Rødby Faerge)" @@ -389,7 +388,7 @@ borders: - id: de-se a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: countries: [{ label: Sweden }] operators: [{ label: SJ }] @@ -402,10 +401,10 @@ borders: sort: true a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: countries: [{ id: poland }] - operators: [{ id: pkp, label: PKP }] + operators: [{ id: pkp }] points: - "Ahlbeck (Gr)" - "Forst (Gr)" @@ -420,9 +419,9 @@ borders: - id: de-bsb a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: - operators: [{ id: bsb, label: BSB }] + operators: [{ id: bsb }] points: - "Friedrichshafen" - "Langenargen" @@ -435,15 +434,10 @@ borders: - id: de-ch a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: countries: [{ id: switzerland }] - operators: - [ - { id: sbb, label: SBB }, - { id: bls, label: BLS }, - { id: sp, label: SP }, - ] + operators: [{ id: sbb }, { id: bls }, { id: sp }] points: - "Basel Bad Bf" - "Konstanz" @@ -453,10 +447,10 @@ borders: - id: de-fr a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] points: - "Apach (fr)" - "Forbach (fr)" @@ -469,19 +463,19 @@ borders: - id: de-lu a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: countries: [{ id: luxembourg }] - operators: [{ id: cfl, label: CFL }] + operators: [{ id: cfl }] points: - "Igel (Gr)" - id: de-eurostar a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: - operators: [{ id: eurostar, label: Eurostar }] + operators: [{ id: eurostar }] points: - "Aachen" - "Duisburg" @@ -493,10 +487,10 @@ borders: - id: de-nl a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: countries: [{ id: netherlands }] - operators: [{ id: ns, label: NS }] + operators: [{ id: ns }] points: - "Bad Bentheim (Gr)" - "Emmerich (Gr)" @@ -508,7 +502,7 @@ borders: - id: gr-mk a: countries: [{ id: greece }] - operators: [{ id: ht, label: Hellenic Train }] + operators: [{ id: ht }] b: countries: [{ label: North Macedonia }] operators: [{ label: ŽRSM }] @@ -518,7 +512,7 @@ borders: - id: gr-tr a: countries: [{ id: greece }] - operators: [{ id: ht, label: Hellenic Train }] + operators: [{ id: ht }] b: countries: [{ label: Turkey }] operators: [{ label: TCDD }] @@ -528,10 +522,10 @@ borders: - id: gr-it a: countries: [{ id: greece }] - operators: [{ id: attica, label: Attica }] + operators: [{ id: attica }] b: countries: [{ id: italy }] - operators: [{ id: attica, label: Attica }] + operators: [{ id: attica }] points: - "Patras (Πάτρα) [>Ancona, >Bari]" - "Ancona [>Igoumenitsa, >Patras]" @@ -540,10 +534,10 @@ borders: - id: hu-sk-mav a: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }] + operators: [{ id: mav }] b: countries: [{ id: slovakia }] - operators: [{ id: zssk, label: ZSSK / ŽSR }] + operators: [{ id: zssk }] points: - "Bánréve (Gr)" - "Čaňa (Gr)" @@ -555,17 +549,17 @@ borders: - id: hu-sk-gysev a: countries: [{ id: hungary }] - operators: [{ id: gysev, label: GySEV }] + operators: [{ id: gysev }] b: countries: [{ id: slovakia }] - operators: [{ id: gysev, label: GySEV }] + operators: [{ id: gysev }] points: - "Rajka (Gr)" - id: hu-ua a: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }] + operators: [{ id: mav }] b: countries: [{ label: Ukraine }] operators: [{ label: UZ }] @@ -575,10 +569,10 @@ borders: - id: hu-ro a: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }] + operators: [{ id: mav }] b: countries: [{ id: romania }] - operators: [{ id: cfr, label: CFR }] + operators: [{ id: cfr }] points: - "Biharkeresztes (fr)" - "Curtici (fr) (Hungarian: Kürtös)" @@ -588,10 +582,10 @@ borders: - id: hu-rs a: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }] + operators: [{ id: mav }] b: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] points: - "Röszke (Gr)" - "Subotica (Gr)" @@ -599,7 +593,7 @@ borders: - id: hu-hr a: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }] + operators: [{ id: mav }] b: countries: [{ label: Croatia }] operators: [{ label: HŽ }] @@ -611,30 +605,30 @@ borders: - id: hu-si a: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }, { id: gysev, label: GySEV }] + operators: [{ id: mav }, { id: gysev }] b: countries: [{ id: slovenia }] - operators: [{ id: sz, label: SŽ }] + operators: [{ id: sz }] points: - "Hodoš (Gr) (Őrihodos)" - id: ie-gb-rail a: countries: [{ id: ireland }] - operators: [{ id: cie, label: CIE }] + operators: [{ id: cie }] b: countries: [{ id: united-kingdom }] - operators: [{ id: nir, label: NIR }] + operators: [{ id: nir }] points: - "Dundalk" - id: ie-gb-sll a: countries: [{ id: ireland }] - operators: [{ id: sll, label: Stena Line Limited }] + operators: [{ id: sll }] b: countries: [{ id: united-kingdom }] - operators: [{ id: sll, label: Stena Line Limited }] + operators: [{ id: sll }] points: - "Dublin Bay / Holyhead" - "Rosslare / Fishguard" @@ -642,10 +636,10 @@ borders: - id: it-si a: countries: [{ id: italy }] - operators: [{ id: fs, label: FS }] + operators: [{ id: fs }] b: countries: [{ id: slovenia }] - operators: [{ id: sz, label: SŽ }] + operators: [{ id: sz }] points: - "Nova Gorica (fr)" - "Villa Opicina (fr) (Slovenian: Opčine, Triestine: Opcina)" @@ -653,10 +647,10 @@ borders: - id: fr-it a: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] b: countries: [{ id: italy }] - operators: [{ id: fs, label: FS }] + operators: [{ id: fs }] points: - "Limone-Confine" - "Modane (fr)" @@ -667,15 +661,10 @@ borders: sort: true a: countries: [{ id: italy }] - operators: [{ id: fs, label: FS }] + operators: [{ id: fs }] b: countries: [{ id: switzerland }] - operators: - [ - { id: sbb, label: SBB }, - { id: bls, label: BLS }, - { id: sp, label: SP }, - ] + operators: [{ id: sbb }, { id: bls }, { id: sp }] points: - "Chiasso" - "Domodossola" @@ -691,15 +680,10 @@ borders: - id: fr-ch a: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] b: countries: [{ id: switzerland }] - operators: - [ - { id: sbb, label: SBB }, - { id: bls, label: BLS }, - { id: sp, label: SP }, - ] + operators: [{ id: sbb }, { id: bls }, { id: sp }] points: - "Annemasse" - "Basel SBB" @@ -713,10 +697,10 @@ borders: - id: lu-fr a: countries: [{ id: luxembourg }] - operators: [{ id: cfl, label: CFL }] + operators: [{ id: cfl }] b: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] points: - "Bettembourg (fr)" - "Rodange (fr)" @@ -724,10 +708,10 @@ borders: - id: es-fr a: countries: [{ id: spain }] - operators: [{ id: renfe, label: Renfe }] + operators: [{ id: renfe }] b: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] points: - "Canfranc (fr)" - "Hendaye (fr)" @@ -737,9 +721,9 @@ borders: - id: fr-eurostar a: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] b: - operators: [{ id: eurostar, label: Eurostar }] + operators: [{ id: eurostar }] points: - "Paris" - "Lille" @@ -747,30 +731,30 @@ borders: - id: gb-eurostar a: countries: [{ id: united-kingdom }] - operators: [{ id: gb, label: National Rail }] + operators: [{ id: gb }] b: countries: [{ id: france }, { id: belgium }, { id: netherlands }] - operators: [{ id: eurostar, label: Eurostar }] + operators: [{ id: eurostar }] points: - "London St. Pancras International" - id: nl-gb-stl a: countries: [{ id: netherlands }] - operators: [{ id: stl, label: Stena Line BV }] + operators: [{ id: stl }] b: countries: [{ id: united-kingdom }] - operators: [{ id: stl, label: Stena Line BV }] + operators: [{ id: stl }] points: - "Hoek van Holland / Harwich P.Q." - id: gb-gb-sll a: countries: [{ id: united-kingdom }] - operators: [{ id: sll, label: Stena Line Limited }] + operators: [{ id: sll }] b: countries: [{ id: united-kingdom }] - operators: [{ id: sll, label: Stena Line Limited }] + operators: [{ id: sll }] points: - "Cairnryan" - "Liverpool" @@ -809,14 +793,14 @@ borders: operators: [{ label: LDz }] b: countries: [{ id: lithuania }] - operators: [{ id: ltg, label: LTG-Link }] + operators: [{ id: ltg }] points: - "Joniškis" - id: lt-by a: countries: [{ id: lithuania }] - operators: [{ id: ltg, label: LTG-Link }] + operators: [{ id: ltg }] b: countries: [{ label: Belarus }] points: @@ -825,17 +809,17 @@ borders: - id: lt-pl a: countries: [{ id: lithuania }] - operators: [{ id: ltg, label: LTG-Link }] + operators: [{ id: ltg }] b: countries: [{ id: poland }] - operators: [{ id: pkp, label: PKP }] + operators: [{ id: pkp }] points: - "Mockava (Gr)" - id: lt-ru a: countries: [{ id: lithuania }] - operators: [{ id: ltg, label: LTG-Link }] + operators: [{ id: ltg }] b: countries: [{ label: Russia }] points: @@ -844,17 +828,17 @@ borders: - id: me-rs a: countries: [{ id: montenegro }] - operators: [{ id: zpcg, label: ŽPCG }] + operators: [{ id: zpcg }] b: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] points: - "Bijelo Polje (Gr)" - id: no-se a: countries: [{ id: norway }] - operators: [{ id: vy, label: Vy }] + operators: [{ id: vy }] b: countries: [{ label: Sweden }] operators: [{ label: SJ }] @@ -867,7 +851,7 @@ borders: - id: pl-ru a: countries: [{ id: poland }] - operators: [{ id: pkp, label: PKP }] + operators: [{ id: pkp }] b: countries: [{ label: Russia }] operators: [{ label: RZD }] @@ -877,7 +861,7 @@ borders: - id: pl-by a: countries: [{ id: poland }] - operators: [{ id: pkp, label: PKP }] + operators: [{ id: pkp }] b: countries: [{ label: Belarus }] operators: [{ label: BC }] @@ -889,7 +873,7 @@ borders: - id: pl-ua a: countries: [{ id: poland }] - operators: [{ id: pkp, label: PKP }] + operators: [{ id: pkp }] b: countries: [{ label: Ukraine }] operators: [{ label: UZ }] @@ -900,17 +884,17 @@ borders: - id: pl-sk a: countries: [{ id: poland }] - operators: [{ id: pkp, label: PKP }] + operators: [{ id: pkp }] b: countries: [{ id: slovakia }] - operators: [{ id: zssk, label: ZSSK / ŽSR }] + operators: [{ id: zssk }] points: - "Lupkow (Gr)" - id: ro-ua a: countries: [{ id: romania }] - operators: [{ id: cfr, label: CFR }] + operators: [{ id: cfr }] b: countries: [{ label: Ukraine }] operators: [{ label: UZ }] @@ -920,7 +904,7 @@ borders: - id: ro-md a: countries: [{ id: romania }] - operators: [{ id: cfr, label: CFR }] + operators: [{ id: cfr }] b: countries: [{ label: Moldova }] operators: [{ label: CFM }] @@ -931,10 +915,10 @@ borders: - id: ro-rs a: countries: [{ id: romania }] - operators: [{ id: cfr, label: CFR }] + operators: [{ id: cfr }] b: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] points: - "Jimbolia (fr) (Serbian: Жомбољ)" - "Vršac (fr) (Serbian: Вршац)" @@ -942,7 +926,7 @@ borders: - id: rs-mk a: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] b: countries: [{ label: North Macedonia }] operators: [{ label: ŽRSM }] @@ -952,7 +936,7 @@ borders: - id: rs-hr a: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] b: countries: [{ label: Croatia }] operators: [{ label: HŽ }] @@ -963,7 +947,7 @@ borders: - id: si-hr a: countries: [{ id: slovenia }] - operators: [{ id: sz, label: SŽ }] + operators: [{ id: sz }] b: countries: [{ label: Croatia }] operators: [{ label: HŽ }] @@ -980,10 +964,10 @@ borders: - id: pt-es a: countries: [{ id: portugal }] - operators: [{ id: cp, label: CP }] + operators: [{ id: cp }] b: countries: [{ id: spain }] - operators: [{ id: renfe, label: Renfe }] + operators: [{ id: renfe }] points: - "Badajoz (fr)" - "Barca de Alva (fr)" diff --git a/content/country/borderpoints.fr.yaml b/content/country/borderpoints.fr.yaml index 213dee272..b78cad8fe 100644 --- a/content/country/borderpoints.fr.yaml +++ b/content/country/borderpoints.fr.yaml @@ -98,10 +98,10 @@ borders: - id: at-cz a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: czechia }] - operators: [{ id: cd, label: ČD }] + operators: [{ id: cd }] points: - "Bernhardsthal (Gr) / Břeclav (Gr)" - "Unterretzbach (Gr) / Retz (Gr)" @@ -111,10 +111,10 @@ borders: - id: at-sk a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: slovakia }] - operators: [{ id: zssk, label: ZSSK / ŽSR }] + operators: [{ id: zssk }] points: - "Marchegg (Gr)" - "Kittsee (Gr)" @@ -122,10 +122,10 @@ borders: - id: at-hu-gysev a: countries: [{ id: austria }] - operators: [{ id: gysev, label: GySEV }] + operators: [{ id: gysev }] b: countries: [{ id: hungary }] - operators: [{ id: gysev, label: GySEV }] + operators: [{ id: gysev }] points: - "Pamhagen (Gr)" - "Szentgotthárd" @@ -134,10 +134,10 @@ borders: - id: at-hu-mav a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }] + operators: [{ id: mav }] points: - "Hegyeshalom (Gr)" - "Sopron" @@ -146,10 +146,10 @@ borders: sort: true a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: slovenia }] - operators: [{ id: sz, label: SŽ }] + operators: [{ id: sz }] points: - "Bleiburg (Gr) (slovène : Pliberk)" - "Spielfeld-Strass (Gr) / Spielfeld (Gr) (slovène : Špilje)" @@ -158,10 +158,10 @@ borders: - id: at-it a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: italy }] - operators: [{ id: fs, label: FS }] + operators: [{ id: fs }] points: - "Brennero/Brenner" - "San Candido/Innichen" @@ -170,10 +170,10 @@ borders: - id: at-ch a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: switzerland }] - operators: [{ id: sbb, label: CFF }] + operators: [{ id: sbb }] points: - "Buchs SG" - "St. Margrethen" @@ -182,10 +182,10 @@ borders: sort: true a: countries: [{ id: austria }] - operators: [{ id: oebb, label: ÖBB }] + operators: [{ id: oebb }] b: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] points: - "Passau Hbf" - "Salzbourg Hbf (trains régionaux vers Salzburg Liefering)" @@ -197,10 +197,10 @@ borders: - id: be-nl a: countries: [{ id: belgium }] - operators: [{ id: sncb, label: SNCB }] + operators: [{ id: sncb }] b: countries: [{ id: netherlands }] - operators: [{ id: ns, label: NS }] + operators: [{ id: ns }] points: - "Roosendaal (fr)" - "Visé (fr)" @@ -208,20 +208,20 @@ borders: - id: be-de a: countries: [{ id: belgium }] - operators: [{ id: sncb, label: SNCB }] + operators: [{ id: sncb }] b: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] points: - "Aachen Süd (Gr)" - id: be-lu a: countries: [{ id: belgium }] - operators: [{ id: sncb, label: SNCB }] + operators: [{ id: sncb }] b: countries: [{ id: luxembourg }] - operators: [{ id: cfl, label: CFL }] + operators: [{ id: cfl }] points: - "Athus" - "Gouvy (fr)" @@ -230,10 +230,10 @@ borders: - id: be-fr a: countries: [{ id: belgium }] - operators: [{ id: sncb, label: SNCB }] + operators: [{ id: sncb }] b: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] points: - "Blandain (fr)" - "Givet (fr)" @@ -244,7 +244,7 @@ borders: - id: ba-hr a: countries: [{ id: bosnia-and-herzegovina }] - operators: [{ id: zfbh, label: ŽFBH }, { id: zrs, label: ŽRS }] + operators: [{ id: zfbh }, { id: zrs }] b: countries: [{ label: Croatie }] operators: [{ label: HŽ }] @@ -258,20 +258,20 @@ borders: - id: ba-rs a: countries: [{ id: bosnia-and-herzegovina }] - operators: [{ id: zfbh, label: ŽFBH }, { id: zrs, label: ŽRS }] + operators: [{ id: zfbh }, { id: zrs }] b: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] points: - "Zvornik" - id: bg-ro a: countries: [{ id: bulgaria }] - operators: [{ id: bdz, label: BDŽ }] + operators: [{ id: bdz }] b: countries: [{ id: romania }] - operators: [{ id: cfr, label: CFR }] + operators: [{ id: cfr }] points: - "Ruse (fr) (bulgare : Русе)" - "Vidin (fr)" @@ -279,7 +279,7 @@ borders: - id: bg-tr a: countries: [{ id: bulgaria }] - operators: [{ id: bdz, label: BDŽ }] + operators: [{ id: bdz }] b: countries: [{ label: Turquie }] operators: [{ label: TCDD }] @@ -289,10 +289,10 @@ borders: - id: bg-gr a: countries: [{ id: bulgaria }] - operators: [{ id: bdz, label: BDŽ }] + operators: [{ id: bdz }] b: countries: [{ id: greece }] - operators: [{ id: ht, label: Hellenic Train }] + operators: [{ id: ht }] points: - "Kulata (fr) (bulgare : Кулата)" - "Svilengrad (fr) (bulgare : Свиленград)" @@ -300,21 +300,20 @@ borders: - id: bg-rs a: countries: [{ id: bulgaria }] - operators: [{ id: bdz, label: BDŽ }] + operators: [{ id: bdz }] b: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] points: - "Dimitrovgrad (fr) (bulgare : Цариброд, Tsaribrod)" - id: cz-pl a: countries: [{ id: czechia }] - operators: [{ id: cd, label: ČD }] + operators: [{ id: cd }] b: countries: [{ id: poland }] - operators: - [{ id: pkp, label: PKP }, { id: kd, label: KD }, { id: ks, label: KŚ }] + operators: [{ id: pkp }, { id: kd }, { id: ks }] points: - "Bohumín (Gr)" - "Český Těšín (Gr)" @@ -327,10 +326,10 @@ borders: - id: cz-sk a: countries: [{ id: czechia }] - operators: [{ id: cd, label: ČD }] + operators: [{ id: cd }] b: countries: [{ id: slovakia }] - operators: [{ id: zssk, label: ZSSK / ŽSR }] + operators: [{ id: zssk }] points: - "Čadca (Gr)" - "Hodonín (Gr)" @@ -344,10 +343,10 @@ borders: sort: true a: countries: [{ id: czechia }] - operators: [{ id: cd, label: ČD }] + operators: [{ id: cd }] b: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] points: - "Selb-Plößberg (Gr) / Aš (Gr)" - "Bayerisch Eisenstein (tchèque : Bavorská Železná ruda)" @@ -366,7 +365,7 @@ borders: - id: dk-se a: countries: [{ id: denmark }] - operators: [{ id: dsb, label: DSB }] + operators: [{ id: dsb }] b: countries: [{ label: Suède }] operators: [{ label: SJ }] @@ -376,10 +375,10 @@ borders: - id: dk-de a: countries: [{ id: denmark }] - operators: [{ id: dsb, label: DSB }] + operators: [{ id: dsb }] b: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] points: - "Flensburg (Gr)" - "Puttgarden (MS) (via Rødby Faerge)" @@ -389,7 +388,7 @@ borders: - id: de-se a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: countries: [{ label: Suède }] operators: [{ label: SJ }] @@ -402,10 +401,10 @@ borders: sort: true a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: countries: [{ id: poland }] - operators: [{ id: pkp, label: PKP }] + operators: [{ id: pkp }] points: - "Ahlbeck (Gr)" - "Forst (Gr)" @@ -420,9 +419,9 @@ borders: - id: de-bsb a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: - operators: [{ id: bsb, label: BSB }] + operators: [{ id: bsb }] points: - "Friedrichshafen" - "Langenargen" @@ -435,15 +434,10 @@ borders: - id: de-ch a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: countries: [{ id: switzerland }] - operators: - [ - { id: sbb, label: CFF }, - { id: bls, label: BLS }, - { id: sp, label: SP }, - ] + operators: [{ id: sbb }, { id: bls }, { id: sp }] points: - "Basel Bad Bf" - "Constance" @@ -453,10 +447,10 @@ borders: - id: de-fr a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] points: - "Apach (fr)" - "Forbach (fr)" @@ -469,19 +463,19 @@ borders: - id: de-lu a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: countries: [{ id: luxembourg }] - operators: [{ id: cfl, label: CFL }] + operators: [{ id: cfl }] points: - "Igel (Gr)" - id: de-eurostar a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: - operators: [{ id: eurostar, label: Eurostar }] + operators: [{ id: eurostar }] points: - "Aachen" - "Duisburg" @@ -493,10 +487,10 @@ borders: - id: de-nl a: countries: [{ id: germany }] - operators: [{ id: db, label: DB }] + operators: [{ id: db }] b: countries: [{ id: netherlands }] - operators: [{ id: ns, label: NS }] + operators: [{ id: ns }] points: - "Bad Bentheim (Gr)" - "Emmerich (Gr)" @@ -508,7 +502,7 @@ borders: - id: gr-mk a: countries: [{ id: greece }] - operators: [{ id: ht, label: Hellenic Train }] + operators: [{ id: ht }] b: countries: [{ label: Macédoine du Nord }] operators: [{ label: ŽRSM }] @@ -518,7 +512,7 @@ borders: - id: gr-tr a: countries: [{ id: greece }] - operators: [{ id: ht, label: Hellenic Train }] + operators: [{ id: ht }] b: countries: [{ label: Turquie }] operators: [{ label: TCDD }] @@ -528,10 +522,10 @@ borders: - id: gr-it a: countries: [{ id: greece }] - operators: [{ id: attica, label: Attica }] + operators: [{ id: attica }] b: countries: [{ id: italy }] - operators: [{ id: attica, label: Attica }] + operators: [{ id: attica }] points: - "Patras (Πάτρα) [>Ancona, >Bari]" - "Ancona [>Igoumenitsa, >Patras]" @@ -540,10 +534,10 @@ borders: - id: hu-sk-mav a: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }] + operators: [{ id: mav }] b: countries: [{ id: slovakia }] - operators: [{ id: zssk, label: ZSSK / ŽSR }] + operators: [{ id: zssk }] points: - "Bánréve (Gr)" - "Čaňa (Gr)" @@ -555,17 +549,17 @@ borders: - id: hu-sk-gysev a: countries: [{ id: hungary }] - operators: [{ id: gysev, label: GySEV }] + operators: [{ id: gysev }] b: countries: [{ id: slovakia }] - operators: [{ id: gysev, label: GySEV }] + operators: [{ id: gysev }] points: - "Rajka (Gr)" - id: hu-ua a: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }] + operators: [{ id: mav }] b: countries: [{ label: Ukraine }] operators: [{ label: UZ }] @@ -575,10 +569,10 @@ borders: - id: hu-ro a: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }] + operators: [{ id: mav }] b: countries: [{ id: romania }] - operators: [{ id: cfr, label: CFR }] + operators: [{ id: cfr }] points: - "Biharkeresztes (fr)" - "Curtici (fr) (hongrois : Kürtös)" @@ -588,10 +582,10 @@ borders: - id: hu-rs a: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }] + operators: [{ id: mav }] b: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] points: - "Röszke (Gr)" - "Subotica (Gr)" @@ -599,7 +593,7 @@ borders: - id: hu-hr a: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }] + operators: [{ id: mav }] b: countries: [{ label: Croatie }] operators: [{ label: HŽ }] @@ -611,30 +605,30 @@ borders: - id: hu-si a: countries: [{ id: hungary }] - operators: [{ id: mav, label: MÁV }, { id: gysev, label: GySEV }] + operators: [{ id: mav }, { id: gysev }] b: countries: [{ id: slovenia }] - operators: [{ id: sz, label: SŽ }] + operators: [{ id: sz }] points: - "Hodoš (Gr) (Őrihodos)" - id: ie-gb-rail a: countries: [{ id: ireland }] - operators: [{ id: cie, label: CIE }] + operators: [{ id: cie }] b: countries: [{ id: united-kingdom }] - operators: [{ id: nir, label: NIR }] + operators: [{ id: nir }] points: - "Dundalk" - id: ie-gb-sll a: countries: [{ id: ireland }] - operators: [{ id: sll, label: Stena Line Limited }] + operators: [{ id: sll }] b: countries: [{ id: united-kingdom }] - operators: [{ id: sll, label: Stena Line Limited }] + operators: [{ id: sll }] points: - "Dublin Bay / Holyhead" - "Rosslare / Fishguard" @@ -642,10 +636,10 @@ borders: - id: it-si a: countries: [{ id: italy }] - operators: [{ id: fs, label: FS }] + operators: [{ id: fs }] b: countries: [{ id: slovenia }] - operators: [{ id: sz, label: SŽ }] + operators: [{ id: sz }] points: - "Nova Gorica (fr)" - "Villa Opicina (fr) (slovène : Opčine, triestin : Opcina)" @@ -653,10 +647,10 @@ borders: - id: fr-it a: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] b: countries: [{ id: italy }] - operators: [{ id: fs, label: FS }] + operators: [{ id: fs }] points: - "Limone-Confine" - "Modane (fr)" @@ -667,15 +661,10 @@ borders: sort: true a: countries: [{ id: italy }] - operators: [{ id: fs, label: FS }] + operators: [{ id: fs }] b: countries: [{ id: switzerland }] - operators: - [ - { id: sbb, label: CFF }, - { id: bls, label: BLS }, - { id: sp, label: SP }, - ] + operators: [{ id: sbb }, { id: bls }, { id: sp }] points: - "Chiasso" - "Domodossola" @@ -691,15 +680,10 @@ borders: - id: fr-ch a: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] b: countries: [{ id: switzerland }] - operators: - [ - { id: sbb, label: CFF }, - { id: bls, label: BLS }, - { id: sp, label: SP }, - ] + operators: [{ id: sbb }, { id: bls }, { id: sp }] points: - "Annemasse" - "Bâle SBB" @@ -713,10 +697,10 @@ borders: - id: lu-fr a: countries: [{ id: luxembourg }] - operators: [{ id: cfl, label: CFL }] + operators: [{ id: cfl }] b: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] points: - "Bettembourg (fr)" - "Rodange (fr)" @@ -724,10 +708,10 @@ borders: - id: es-fr a: countries: [{ id: spain }] - operators: [{ id: renfe, label: Renfe }] + operators: [{ id: renfe }] b: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] points: - "Canfranc (fr)" - "Hendaye (fr)" @@ -737,9 +721,9 @@ borders: - id: fr-eurostar a: countries: [{ id: france }] - operators: [{ id: sncf, label: SNCF }] + operators: [{ id: sncf }] b: - operators: [{ id: eurostar, label: Eurostar }] + operators: [{ id: eurostar }] points: - "Paris" - "Lille" @@ -747,30 +731,30 @@ borders: - id: gb-eurostar a: countries: [{ id: united-kingdom }] - operators: [{ id: gb, label: National Rail }] + operators: [{ id: gb }] b: countries: [{ id: france }, { id: belgium }, { id: netherlands }] - operators: [{ id: eurostar, label: Eurostar }] + operators: [{ id: eurostar }] points: - "London St. Pancras International" - id: nl-gb-stl a: countries: [{ id: netherlands }] - operators: [{ id: stl, label: Stena Line BV }] + operators: [{ id: stl }] b: countries: [{ id: united-kingdom }] - operators: [{ id: stl, label: Stena Line BV }] + operators: [{ id: stl }] points: - "Hoek van Holland / Harwich P.Q." - id: gb-gb-sll a: countries: [{ id: united-kingdom }] - operators: [{ id: sll, label: Stena Line Limited }] + operators: [{ id: sll }] b: countries: [{ id: united-kingdom }] - operators: [{ id: sll, label: Stena Line Limited }] + operators: [{ id: sll }] points: - "Cairnryan" - "Liverpool" @@ -809,14 +793,14 @@ borders: operators: [{ label: LDz }] b: countries: [{ id: lithuania }] - operators: [{ id: ltg, label: LTG-Link }] + operators: [{ id: ltg }] points: - "Joniškis" - id: lt-by a: countries: [{ id: lithuania }] - operators: [{ id: ltg, label: LTG-Link }] + operators: [{ id: ltg }] b: countries: [{ label: Biélorussie }] points: @@ -825,17 +809,17 @@ borders: - id: lt-pl a: countries: [{ id: lithuania }] - operators: [{ id: ltg, label: LTG-Link }] + operators: [{ id: ltg }] b: countries: [{ id: poland }] - operators: [{ id: pkp, label: PKP }] + operators: [{ id: pkp }] points: - "Mockava (Gr)" - id: lt-ru a: countries: [{ id: lithuania }] - operators: [{ id: ltg, label: LTG-Link }] + operators: [{ id: ltg }] b: countries: [{ label: Russie }] points: @@ -844,17 +828,17 @@ borders: - id: me-rs a: countries: [{ id: montenegro }] - operators: [{ id: zpcg, label: ŽPCG }] + operators: [{ id: zpcg }] b: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] points: - "Bijelo Polje (Gr)" - id: no-se a: countries: [{ id: norway }] - operators: [{ id: vy, label: Vy }] + operators: [{ id: vy }] b: countries: [{ label: Suède }] operators: [{ label: SJ }] @@ -867,7 +851,7 @@ borders: - id: pl-ru a: countries: [{ id: poland }] - operators: [{ id: pkp, label: PKP }] + operators: [{ id: pkp }] b: countries: [{ label: Russie }] operators: [{ label: RZD }] @@ -877,7 +861,7 @@ borders: - id: pl-by a: countries: [{ id: poland }] - operators: [{ id: pkp, label: PKP }] + operators: [{ id: pkp }] b: countries: [{ label: Biélorussie }] operators: [{ label: BC }] @@ -889,7 +873,7 @@ borders: - id: pl-ua a: countries: [{ id: poland }] - operators: [{ id: pkp, label: PKP }] + operators: [{ id: pkp }] b: countries: [{ label: Ukraine }] operators: [{ label: UZ }] @@ -900,17 +884,17 @@ borders: - id: pl-sk a: countries: [{ id: poland }] - operators: [{ id: pkp, label: PKP }] + operators: [{ id: pkp }] b: countries: [{ id: slovakia }] - operators: [{ id: zssk, label: ZSSK / ŽSR }] + operators: [{ id: zssk }] points: - "Lupkow (Gr)" - id: ro-ua a: countries: [{ id: romania }] - operators: [{ id: cfr, label: CFR }] + operators: [{ id: cfr }] b: countries: [{ label: Ukraine }] operators: [{ label: UZ }] @@ -920,7 +904,7 @@ borders: - id: ro-md a: countries: [{ id: romania }] - operators: [{ id: cfr, label: CFR }] + operators: [{ id: cfr }] b: countries: [{ label: Moldavie }] operators: [{ label: CFM }] @@ -931,10 +915,10 @@ borders: - id: ro-rs a: countries: [{ id: romania }] - operators: [{ id: cfr, label: CFR }] + operators: [{ id: cfr }] b: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] points: - "Jimbolia (fr) (serbe : Жомбољ)" - "Vršac (fr) (serbe : Вршац)" @@ -942,7 +926,7 @@ borders: - id: rs-mk a: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] b: countries: [{ label: Macédoine du Nord }] operators: [{ label: ŽRSM }] @@ -952,7 +936,7 @@ borders: - id: rs-hr a: countries: [{ id: serbia }] - operators: [{ id: sv, label: SV }] + operators: [{ id: sv }] b: countries: [{ label: Croatie }] operators: [{ label: HŽ }] @@ -963,7 +947,7 @@ borders: - id: si-hr a: countries: [{ id: slovenia }] - operators: [{ id: sz, label: SŽ }] + operators: [{ id: sz }] b: countries: [{ label: Croatie }] operators: [{ label: HŽ }] @@ -980,10 +964,10 @@ borders: - id: pt-es a: countries: [{ id: portugal }] - operators: [{ id: cp, label: CP }] + operators: [{ id: cp }] b: countries: [{ id: spain }] - operators: [{ id: renfe, label: Renfe }] + operators: [{ id: renfe }] points: - "Badajoz (fr)" - "Barca de Alva (fr)" diff --git a/content/operator/attica/index.de.md b/content/operator/attica/index.de.md index 721f68aa0..7909a000e 100644 --- a/content/operator/attica/index.de.md +++ b/content/operator/attica/index.de.md @@ -1,5 +1,6 @@ --- title: Attica +shortName: Attica country: - greece - italy diff --git a/content/operator/attica/index.en.md b/content/operator/attica/index.en.md index c04507810..11057993d 100644 --- a/content/operator/attica/index.en.md +++ b/content/operator/attica/index.en.md @@ -1,5 +1,6 @@ --- title: Attica +shortName: Attica country: - greece - italy diff --git a/content/operator/attica/index.fr.md b/content/operator/attica/index.fr.md index 39f1c67d9..66a0d094b 100644 --- a/content/operator/attica/index.fr.md +++ b/content/operator/attica/index.fr.md @@ -1,5 +1,6 @@ --- title: Attica +shortName: Attica country: - greece - italy diff --git a/content/operator/bdz/index.de.md b/content/operator/bdz/index.de.md index c0a23138b..d5a4a4f6b 100644 --- a/content/operator/bdz/index.de.md +++ b/content/operator/bdz/index.de.md @@ -1,5 +1,6 @@ --- title: BDŽ +shortName: BDŽ country: - bulgaria operator: bdz diff --git a/content/operator/bdz/index.en.md b/content/operator/bdz/index.en.md index 6b5258ff7..43b6d6214 100644 --- a/content/operator/bdz/index.en.md +++ b/content/operator/bdz/index.en.md @@ -1,5 +1,6 @@ --- title: BDŽ +shortName: BDŽ country: - bulgaria operator: bdz diff --git a/content/operator/bdz/index.fr.md b/content/operator/bdz/index.fr.md index ac43f5c3c..70cbff80f 100644 --- a/content/operator/bdz/index.fr.md +++ b/content/operator/bdz/index.fr.md @@ -1,5 +1,6 @@ --- title: BDŽ +shortName: BDŽ country: - bulgaria operator: bdz diff --git a/content/operator/bls/index.de.md b/content/operator/bls/index.de.md index 46d7f14d4..e5c5615f2 100644 --- a/content/operator/bls/index.de.md +++ b/content/operator/bls/index.de.md @@ -1,5 +1,6 @@ --- title: BLS +shortName: BLS country: - switzerland aliases: diff --git a/content/operator/bls/index.en.md b/content/operator/bls/index.en.md index e5a675819..b72cde293 100644 --- a/content/operator/bls/index.en.md +++ b/content/operator/bls/index.en.md @@ -1,5 +1,6 @@ --- title: BLS +shortName: BLS country: - switzerland aliases: diff --git a/content/operator/bls/index.fr.md b/content/operator/bls/index.fr.md index d74774a8c..da7e06d5e 100644 --- a/content/operator/bls/index.fr.md +++ b/content/operator/bls/index.fr.md @@ -1,5 +1,6 @@ --- title: BLS +shortName: BLS country: - switzerland aliases: diff --git a/content/operator/bsb/index.de.md b/content/operator/bsb/index.de.md index d79a83076..2d337ccf9 100644 --- a/content/operator/bsb/index.de.md +++ b/content/operator/bsb/index.de.md @@ -1,5 +1,6 @@ --- title: BSB +shortName: BSB country: - austria - germany diff --git a/content/operator/bsb/index.en.md b/content/operator/bsb/index.en.md index dcd140715..2b14ad722 100644 --- a/content/operator/bsb/index.en.md +++ b/content/operator/bsb/index.en.md @@ -1,5 +1,6 @@ --- title: BSB +shortName: BSB country: - austria - germany diff --git a/content/operator/bsb/index.fr.md b/content/operator/bsb/index.fr.md index 5ebd0db01..ad1de35fd 100644 --- a/content/operator/bsb/index.fr.md +++ b/content/operator/bsb/index.fr.md @@ -1,5 +1,6 @@ --- title: BSB +shortName: BSB country: - austria - germany diff --git a/content/operator/cd/index.de.md b/content/operator/cd/index.de.md index 3d5914a32..ad7f3799f 100644 --- a/content/operator/cd/index.de.md +++ b/content/operator/cd/index.de.md @@ -1,5 +1,6 @@ --- title: ČD +shortName: ČD country: - czechia operator: cd diff --git a/content/operator/cd/index.en.md b/content/operator/cd/index.en.md index 0f3a2b653..07fb4edef 100644 --- a/content/operator/cd/index.en.md +++ b/content/operator/cd/index.en.md @@ -1,5 +1,6 @@ --- title: ČD +shortName: ČD country: - czechia operator: cd diff --git a/content/operator/cd/index.fr.md b/content/operator/cd/index.fr.md index 83bd68596..81c19c2e7 100644 --- a/content/operator/cd/index.fr.md +++ b/content/operator/cd/index.fr.md @@ -1,5 +1,6 @@ --- title: ČD +shortName: ČD country: - czechia operator: cd diff --git a/content/operator/cfl/index.de.md b/content/operator/cfl/index.de.md index 7a8d91ac8..030d10f25 100644 --- a/content/operator/cfl/index.de.md +++ b/content/operator/cfl/index.de.md @@ -1,5 +1,6 @@ --- title: CFL +shortName: CFL country: - luxembourg operator: cfl diff --git a/content/operator/cfl/index.en.md b/content/operator/cfl/index.en.md index 258194415..fb7f3740d 100644 --- a/content/operator/cfl/index.en.md +++ b/content/operator/cfl/index.en.md @@ -1,5 +1,6 @@ --- title: CFL +shortName: CFL country: - luxembourg operator: cfl diff --git a/content/operator/cfl/index.fr.md b/content/operator/cfl/index.fr.md index 9ed946153..8ca7de8b4 100644 --- a/content/operator/cfl/index.fr.md +++ b/content/operator/cfl/index.fr.md @@ -1,5 +1,6 @@ --- title: CFL +shortName: CFL country: - luxembourg operator: cfl diff --git a/content/operator/cfr/index.de.md b/content/operator/cfr/index.de.md index 2ebdb9c75..13b9ff98d 100644 --- a/content/operator/cfr/index.de.md +++ b/content/operator/cfr/index.de.md @@ -1,5 +1,6 @@ --- title: CFR Călători +shortName: CFR country: - romania operator: cfr diff --git a/content/operator/cfr/index.en.md b/content/operator/cfr/index.en.md index 11a6f20aa..3a8b047e3 100644 --- a/content/operator/cfr/index.en.md +++ b/content/operator/cfr/index.en.md @@ -1,5 +1,6 @@ --- title: CFR Călători +shortName: CFR country: - romania operator: cfr diff --git a/content/operator/cfr/index.fr.md b/content/operator/cfr/index.fr.md index 56f39b459..32d7c1293 100644 --- a/content/operator/cfr/index.fr.md +++ b/content/operator/cfr/index.fr.md @@ -1,5 +1,6 @@ --- title: CFR Călători +shortName: CFR country: - romania operator: cfr diff --git a/content/operator/cie/index.de.md b/content/operator/cie/index.de.md index 2044d3a0f..0a7d550ed 100644 --- a/content/operator/cie/index.de.md +++ b/content/operator/cie/index.de.md @@ -1,5 +1,6 @@ --- title: CIE +shortName: CIE country: - ireland operator: cie diff --git a/content/operator/cie/index.en.md b/content/operator/cie/index.en.md index 55ec53f9d..a6583dffb 100644 --- a/content/operator/cie/index.en.md +++ b/content/operator/cie/index.en.md @@ -1,5 +1,6 @@ --- title: CIE +shortName: CIE country: - ireland operator: cie diff --git a/content/operator/cie/index.fr.md b/content/operator/cie/index.fr.md index 3aceff233..0582c31d0 100644 --- a/content/operator/cie/index.fr.md +++ b/content/operator/cie/index.fr.md @@ -1,5 +1,6 @@ --- title: CIE +shortName: CIE country: - ireland operator: cie diff --git a/content/operator/cp/index.de.md b/content/operator/cp/index.de.md index 0fcee54ce..9aef5cd35 100644 --- a/content/operator/cp/index.de.md +++ b/content/operator/cp/index.de.md @@ -1,5 +1,6 @@ --- title: CP +shortName: CP country: - portugal operator: cp diff --git a/content/operator/cp/index.en.md b/content/operator/cp/index.en.md index ae92aefa4..3e8584ba8 100644 --- a/content/operator/cp/index.en.md +++ b/content/operator/cp/index.en.md @@ -1,5 +1,6 @@ --- title: CP +shortName: CP country: - portugal operator: cp diff --git a/content/operator/cp/index.fr.md b/content/operator/cp/index.fr.md index 93bbc0bf4..4cddc5684 100644 --- a/content/operator/cp/index.fr.md +++ b/content/operator/cp/index.fr.md @@ -1,5 +1,6 @@ --- title: CP +shortName: CP country: - portugal operator: cp diff --git a/content/operator/db/index.de.md b/content/operator/db/index.de.md index 5d9ff519d..dd0650272 100644 --- a/content/operator/db/index.de.md +++ b/content/operator/db/index.de.md @@ -1,5 +1,6 @@ --- title: DB +shortName: DB country: - germany operator: db diff --git a/content/operator/db/index.en.md b/content/operator/db/index.en.md index dacd3b89d..9bf8f118b 100644 --- a/content/operator/db/index.en.md +++ b/content/operator/db/index.en.md @@ -1,5 +1,6 @@ --- title: DB +shortName: DB country: - germany operator: db diff --git a/content/operator/db/index.fr.md b/content/operator/db/index.fr.md index d6526e248..31a4b67f9 100644 --- a/content/operator/db/index.fr.md +++ b/content/operator/db/index.fr.md @@ -1,5 +1,6 @@ --- title: DB +shortName: DB country: - germany operator: db diff --git a/content/operator/dsb/index.de.md b/content/operator/dsb/index.de.md index 013f269dd..0e3a9a4f9 100644 --- a/content/operator/dsb/index.de.md +++ b/content/operator/dsb/index.de.md @@ -1,5 +1,6 @@ --- title: DSB +shortName: DSB country: - denmark operator: dsb diff --git a/content/operator/dsb/index.en.md b/content/operator/dsb/index.en.md index 924024bfb..3028a730e 100644 --- a/content/operator/dsb/index.en.md +++ b/content/operator/dsb/index.en.md @@ -1,5 +1,6 @@ --- title: DSB +shortName: DSB country: - denmark operator: dsb diff --git a/content/operator/dsb/index.fr.md b/content/operator/dsb/index.fr.md index 7febbd1af..56ac98f61 100644 --- a/content/operator/dsb/index.fr.md +++ b/content/operator/dsb/index.fr.md @@ -1,5 +1,6 @@ --- title: DSB +shortName: DSB country: - denmark operator: dsb diff --git a/content/operator/eurostar/index.de.md b/content/operator/eurostar/index.de.md index 997b25362..9989b6045 100644 --- a/content/operator/eurostar/index.de.md +++ b/content/operator/eurostar/index.de.md @@ -1,5 +1,6 @@ --- title: Eurostar +shortName: Eurostar country: - belgium - germany diff --git a/content/operator/eurostar/index.en.md b/content/operator/eurostar/index.en.md index 2df112795..5e93ca850 100644 --- a/content/operator/eurostar/index.en.md +++ b/content/operator/eurostar/index.en.md @@ -1,5 +1,6 @@ --- title: Eurostar +shortName: Eurostar country: - belgium - germany diff --git a/content/operator/eurostar/index.fr.md b/content/operator/eurostar/index.fr.md index aeba36d57..eaaf0f399 100644 --- a/content/operator/eurostar/index.fr.md +++ b/content/operator/eurostar/index.fr.md @@ -1,5 +1,6 @@ --- title: Eurostar +shortName: Eurostar country: - belgium - germany diff --git a/content/operator/fs/index.de.md b/content/operator/fs/index.de.md index 3e893203d..90888cd66 100644 --- a/content/operator/fs/index.de.md +++ b/content/operator/fs/index.de.md @@ -1,5 +1,6 @@ --- title: Trenitalia +shortName: FS country: - italy operator: trenitalia diff --git a/content/operator/fs/index.en.md b/content/operator/fs/index.en.md index 4634b7f80..6b70977c5 100644 --- a/content/operator/fs/index.en.md +++ b/content/operator/fs/index.en.md @@ -1,5 +1,6 @@ --- title: Trenitalia +shortName: FS country: - italy operator: trenitalia diff --git a/content/operator/fs/index.fr.md b/content/operator/fs/index.fr.md index 413038dd7..457e53570 100644 --- a/content/operator/fs/index.fr.md +++ b/content/operator/fs/index.fr.md @@ -1,5 +1,6 @@ --- title: Trenitalia +shortName: FS country: - italy operator: trenitalia diff --git a/content/operator/gb/index.de.md b/content/operator/gb/index.de.md index e506e6604..4c3bdf217 100644 --- a/content/operator/gb/index.de.md +++ b/content/operator/gb/index.de.md @@ -1,5 +1,6 @@ --- title: National Rail +shortName: National Rail country: - united-kingdom operator: gb diff --git a/content/operator/gb/index.en.md b/content/operator/gb/index.en.md index a37961219..c79581885 100644 --- a/content/operator/gb/index.en.md +++ b/content/operator/gb/index.en.md @@ -1,5 +1,6 @@ --- title: National Rail +shortName: National Rail country: - united-kingdom operator: gb diff --git a/content/operator/gb/index.fr.md b/content/operator/gb/index.fr.md index fd4c1dba0..24d360949 100644 --- a/content/operator/gb/index.fr.md +++ b/content/operator/gb/index.fr.md @@ -1,5 +1,6 @@ --- title: National Rail +shortName: National Rail country: - united-kingdom operator: gb diff --git a/content/operator/gysev/index.de.md b/content/operator/gysev/index.de.md index 7fd358157..77b288432 100644 --- a/content/operator/gysev/index.de.md +++ b/content/operator/gysev/index.de.md @@ -1,5 +1,6 @@ --- title: GySEV / Raaberbahn +shortName: GySEV country: - austria - hungary diff --git a/content/operator/gysev/index.en.md b/content/operator/gysev/index.en.md index bcc87560d..b4b0fa512 100644 --- a/content/operator/gysev/index.en.md +++ b/content/operator/gysev/index.en.md @@ -1,5 +1,6 @@ --- title: GySEV / Raaberbahn +shortName: GySEV country: - austria - hungary diff --git a/content/operator/gysev/index.fr.md b/content/operator/gysev/index.fr.md index c3115776b..1ed16af1a 100644 --- a/content/operator/gysev/index.fr.md +++ b/content/operator/gysev/index.fr.md @@ -1,5 +1,6 @@ --- title: GySEV / Raaberbahn +shortName: GySEV country: - austria - hungary diff --git a/content/operator/ht/index.de.md b/content/operator/ht/index.de.md index e5fa315ea..27bdf1406 100644 --- a/content/operator/ht/index.de.md +++ b/content/operator/ht/index.de.md @@ -1,5 +1,6 @@ --- title: Hellenic Train +shortName: Hellenic Train country: - greece operator: ht diff --git a/content/operator/ht/index.en.md b/content/operator/ht/index.en.md index 51eb3d342..7dbcd4dae 100644 --- a/content/operator/ht/index.en.md +++ b/content/operator/ht/index.en.md @@ -1,5 +1,6 @@ --- title: Hellenic Train +shortName: Hellenic Train country: - greece operator: ht diff --git a/content/operator/ht/index.fr.md b/content/operator/ht/index.fr.md index 36c21fa2e..230e788bf 100644 --- a/content/operator/ht/index.fr.md +++ b/content/operator/ht/index.fr.md @@ -1,5 +1,6 @@ --- title: Hellenic Train +shortName: Hellenic Train country: - greece operator: ht diff --git a/content/operator/kd/index.de.md b/content/operator/kd/index.de.md index 8ddd7af6a..8ece82801 100644 --- a/content/operator/kd/index.de.md +++ b/content/operator/kd/index.de.md @@ -1,5 +1,6 @@ --- title: KD +shortName: KD country: - poland operator: kd diff --git a/content/operator/kd/index.en.md b/content/operator/kd/index.en.md index dc2f813a5..f60c3033e 100644 --- a/content/operator/kd/index.en.md +++ b/content/operator/kd/index.en.md @@ -1,5 +1,6 @@ --- title: KD +shortName: KD country: - poland operator: kd diff --git a/content/operator/kd/index.fr.md b/content/operator/kd/index.fr.md index 49c5da986..31029dda4 100644 --- a/content/operator/kd/index.fr.md +++ b/content/operator/kd/index.fr.md @@ -1,5 +1,6 @@ --- title: KD +shortName: KD country: - pologne operator: kd diff --git a/content/operator/ks/index.de.md b/content/operator/ks/index.de.md index 43a0796aa..b8fe1df4c 100644 --- a/content/operator/ks/index.de.md +++ b/content/operator/ks/index.de.md @@ -1,5 +1,6 @@ --- title: KŚ +shortName: KŚ country: - poland operator: ks diff --git a/content/operator/ks/index.en.md b/content/operator/ks/index.en.md index 02588ed3b..59502a2b1 100644 --- a/content/operator/ks/index.en.md +++ b/content/operator/ks/index.en.md @@ -1,5 +1,6 @@ --- title: KŚ +shortName: KŚ country: - poland operator: ks diff --git a/content/operator/ks/index.fr.md b/content/operator/ks/index.fr.md index 28e32fb87..37fced9c5 100644 --- a/content/operator/ks/index.fr.md +++ b/content/operator/ks/index.fr.md @@ -1,5 +1,6 @@ --- title: KŚ +shortName: KŚ country: - poland operator: ks diff --git a/content/operator/ltg/index.de.md b/content/operator/ltg/index.de.md index fa56ac630..7e36bdc9b 100644 --- a/content/operator/ltg/index.de.md +++ b/content/operator/ltg/index.de.md @@ -1,5 +1,6 @@ --- title: LTG-Link +shortName: LTG-Link country: - lithuania - latvia diff --git a/content/operator/ltg/index.en.md b/content/operator/ltg/index.en.md index 06ee8bcaf..486d356a2 100644 --- a/content/operator/ltg/index.en.md +++ b/content/operator/ltg/index.en.md @@ -1,5 +1,6 @@ --- title: LTG-Link +shortName: LTG-Link country: - lithuania - latvia diff --git a/content/operator/ltg/index.fr.md b/content/operator/ltg/index.fr.md index 11c3ee527..db3e1fee7 100644 --- a/content/operator/ltg/index.fr.md +++ b/content/operator/ltg/index.fr.md @@ -1,5 +1,6 @@ --- title: LTG-Link +shortName: LTG-Link country: - lithuania - latvia diff --git a/content/operator/mav/index.de.md b/content/operator/mav/index.de.md index 1bb0ff786..b5937ff92 100644 --- a/content/operator/mav/index.de.md +++ b/content/operator/mav/index.de.md @@ -1,5 +1,6 @@ --- title: MÁV-START +shortName: MÁV country: - hungary operator: mav diff --git a/content/operator/mav/index.en.md b/content/operator/mav/index.en.md index e67ffc3e1..edb0aecd5 100644 --- a/content/operator/mav/index.en.md +++ b/content/operator/mav/index.en.md @@ -1,5 +1,6 @@ --- title: MÁV-START +shortName: MÁV country: - hungary operator: mav diff --git a/content/operator/mav/index.fr.md b/content/operator/mav/index.fr.md index 25cf9d9d8..e6ac4a569 100644 --- a/content/operator/mav/index.fr.md +++ b/content/operator/mav/index.fr.md @@ -1,5 +1,6 @@ --- title: MÁV-START +shortName: MÁV country: - hungary operator: mav diff --git a/content/operator/nir/index.de.md b/content/operator/nir/index.de.md index 3768e0cb1..cec6ee025 100644 --- a/content/operator/nir/index.de.md +++ b/content/operator/nir/index.de.md @@ -1,5 +1,6 @@ --- title: NIR +shortName: NIR country: - united-kingdom operator: nir diff --git a/content/operator/nir/index.en.md b/content/operator/nir/index.en.md index 129fee5f8..84b4891a8 100644 --- a/content/operator/nir/index.en.md +++ b/content/operator/nir/index.en.md @@ -1,5 +1,6 @@ --- title: NIR +shortName: NIR country: - united-kingdom operator: nir diff --git a/content/operator/nir/index.fr.md b/content/operator/nir/index.fr.md index 823af062c..9f9a38ff3 100644 --- a/content/operator/nir/index.fr.md +++ b/content/operator/nir/index.fr.md @@ -1,5 +1,6 @@ --- title: NIR +shortName: NIR country: - united-kingdom operator: nir diff --git a/content/operator/ns/index.de.md b/content/operator/ns/index.de.md index a6135ca19..c680859e3 100644 --- a/content/operator/ns/index.de.md +++ b/content/operator/ns/index.de.md @@ -1,5 +1,6 @@ --- title: NS +shortName: NS country: - netherlands operator: ns diff --git a/content/operator/ns/index.en.md b/content/operator/ns/index.en.md index 0d508574a..44bba6e8b 100644 --- a/content/operator/ns/index.en.md +++ b/content/operator/ns/index.en.md @@ -1,5 +1,6 @@ --- title: NS +shortName: NS country: - netherlands operator: ns diff --git a/content/operator/ns/index.fr.md b/content/operator/ns/index.fr.md index 82da15dd4..331720fa1 100644 --- a/content/operator/ns/index.fr.md +++ b/content/operator/ns/index.fr.md @@ -1,5 +1,6 @@ --- title: NS +shortName: NS country: - netherlands operator: ns diff --git a/content/operator/oebb/index.de.md b/content/operator/oebb/index.de.md index 0aa8ff58f..309656c9f 100644 --- a/content/operator/oebb/index.de.md +++ b/content/operator/oebb/index.de.md @@ -1,5 +1,6 @@ --- title: ÖBB +shortName: ÖBB country: - austria - liechtenstein diff --git a/content/operator/oebb/index.en.md b/content/operator/oebb/index.en.md index 433c3d110..84ee1ddd0 100644 --- a/content/operator/oebb/index.en.md +++ b/content/operator/oebb/index.en.md @@ -1,5 +1,6 @@ --- title: ÖBB +shortName: ÖBB country: - austria - liechtenstein diff --git a/content/operator/oebb/index.fr.md b/content/operator/oebb/index.fr.md index 8f64396fe..ddf99cf12 100644 --- a/content/operator/oebb/index.fr.md +++ b/content/operator/oebb/index.fr.md @@ -1,5 +1,6 @@ --- title: ÖBB +shortName: ÖBB country: - austria - liechtenstein diff --git a/content/operator/pkp/index.de.md b/content/operator/pkp/index.de.md index 78fab634f..6fbbd9106 100644 --- a/content/operator/pkp/index.de.md +++ b/content/operator/pkp/index.de.md @@ -1,5 +1,6 @@ --- title: PKP +shortName: PKP country: - poland operator: pkp diff --git a/content/operator/pkp/index.en.md b/content/operator/pkp/index.en.md index 9ce10ec61..9f10377bf 100644 --- a/content/operator/pkp/index.en.md +++ b/content/operator/pkp/index.en.md @@ -1,5 +1,6 @@ --- title: PKP +shortName: PKP country: - poland operator: pkp diff --git a/content/operator/pkp/index.fr.md b/content/operator/pkp/index.fr.md index 521305eb2..3ccf4321f 100644 --- a/content/operator/pkp/index.fr.md +++ b/content/operator/pkp/index.fr.md @@ -1,5 +1,6 @@ --- title: PKP +shortName: PKP country: - poland operator: pkp diff --git a/content/operator/renfe/index.de.md b/content/operator/renfe/index.de.md index 2748dc465..bcfbee731 100644 --- a/content/operator/renfe/index.de.md +++ b/content/operator/renfe/index.de.md @@ -1,5 +1,6 @@ --- title: Renfe +shortName: Renfe country: - spain - france diff --git a/content/operator/renfe/index.en.md b/content/operator/renfe/index.en.md index 6b0675141..3b4272878 100644 --- a/content/operator/renfe/index.en.md +++ b/content/operator/renfe/index.en.md @@ -1,5 +1,6 @@ --- title: Renfe +shortName: Renfe country: - spain - france diff --git a/content/operator/renfe/index.fr.md b/content/operator/renfe/index.fr.md index 040a7ee84..08d54ef53 100644 --- a/content/operator/renfe/index.fr.md +++ b/content/operator/renfe/index.fr.md @@ -1,5 +1,6 @@ --- title: Renfe +shortName: Renfe country: - spain - france diff --git a/content/operator/sbb/index.de.md b/content/operator/sbb/index.de.md index 0b5911c2b..ebab48755 100644 --- a/content/operator/sbb/index.de.md +++ b/content/operator/sbb/index.de.md @@ -1,5 +1,6 @@ --- title: SBB CFF FFS +shortName: SBB country: - switzerland aliases: diff --git a/content/operator/sbb/index.en.md b/content/operator/sbb/index.en.md index 3e317dbe1..6ba221788 100644 --- a/content/operator/sbb/index.en.md +++ b/content/operator/sbb/index.en.md @@ -1,5 +1,6 @@ --- title: SBB CFF FFS +shortName: SBB country: - switzerland aliases: diff --git a/content/operator/sbb/index.fr.md b/content/operator/sbb/index.fr.md index 891bae9a9..a047b7ea6 100644 --- a/content/operator/sbb/index.fr.md +++ b/content/operator/sbb/index.fr.md @@ -1,5 +1,6 @@ --- title: SBB CFF FFS +shortName: CFF country: - switzerland aliases: diff --git a/content/operator/sll/index.de.md b/content/operator/sll/index.de.md index 75d685a18..c69720ba7 100644 --- a/content/operator/sll/index.de.md +++ b/content/operator/sll/index.de.md @@ -1,5 +1,6 @@ --- title: Stena Line Limited +shortName: Stena Line Limited country: - ireland - united-kingdom diff --git a/content/operator/sll/index.en.md b/content/operator/sll/index.en.md index 9336176fb..4d18428c5 100644 --- a/content/operator/sll/index.en.md +++ b/content/operator/sll/index.en.md @@ -1,5 +1,6 @@ --- title: Stena Line Limited +shortName: Stena Line Limited country: - ireland - united-kingdom diff --git a/content/operator/sll/index.fr.md b/content/operator/sll/index.fr.md index c29ee5d32..f9e295134 100644 --- a/content/operator/sll/index.fr.md +++ b/content/operator/sll/index.fr.md @@ -1,5 +1,6 @@ --- title: Stena Line Limited +shortName: Stena Line Limited country: - ireland - united-kingdom diff --git a/content/operator/sncb/index.de.md b/content/operator/sncb/index.de.md index 62591f6e0..48e3394d4 100644 --- a/content/operator/sncb/index.de.md +++ b/content/operator/sncb/index.de.md @@ -1,5 +1,6 @@ --- title: SNCB / NMBS +shortName: SNCB country: - belgium operator: sncb diff --git a/content/operator/sncb/index.en.md b/content/operator/sncb/index.en.md index 2dafd7f88..fe6af5c49 100644 --- a/content/operator/sncb/index.en.md +++ b/content/operator/sncb/index.en.md @@ -1,5 +1,6 @@ --- title: SNCB / NMBS +shortName: SNCB country: - belgium operator: sncb diff --git a/content/operator/sncb/index.fr.md b/content/operator/sncb/index.fr.md index 33a0a2461..df1bdbb8b 100644 --- a/content/operator/sncb/index.fr.md +++ b/content/operator/sncb/index.fr.md @@ -1,5 +1,6 @@ --- title: SNCB / NMBS +shortName: SNCB country: - belgium operator: sncb diff --git a/content/operator/sncf/index.de.md b/content/operator/sncf/index.de.md index 403494bd1..ded0bea9a 100644 --- a/content/operator/sncf/index.de.md +++ b/content/operator/sncf/index.de.md @@ -1,5 +1,6 @@ --- title: SNCF Voyageurs +shortName: SNCF country: - france - germany diff --git a/content/operator/sncf/index.en.md b/content/operator/sncf/index.en.md index 876e3f6df..468aa99f1 100644 --- a/content/operator/sncf/index.en.md +++ b/content/operator/sncf/index.en.md @@ -1,5 +1,6 @@ --- title: SNCF Voyageurs +shortName: SNCF country: - france - germany diff --git a/content/operator/sncf/index.fr.md b/content/operator/sncf/index.fr.md index 99ebdcea6..5a1a9988b 100644 --- a/content/operator/sncf/index.fr.md +++ b/content/operator/sncf/index.fr.md @@ -1,5 +1,6 @@ --- title: SNCF Voyageurs +shortName: SNCF country: - france - germany diff --git a/content/operator/sp/index.de.md b/content/operator/sp/index.de.md index 3efccfa1f..389470800 100644 --- a/content/operator/sp/index.de.md +++ b/content/operator/sp/index.de.md @@ -1,5 +1,6 @@ --- title: Schweizer Privatbahnen +shortName: SP description: Informationen über die FIP-Bedingungen bei den Schweizer Privatbahnen. country: - switzerland diff --git a/content/operator/sp/index.en.md b/content/operator/sp/index.en.md index 9faaeca94..530b3ee66 100644 --- a/content/operator/sp/index.en.md +++ b/content/operator/sp/index.en.md @@ -1,5 +1,6 @@ --- title: Schweizer Privatbahnen +shortName: SP description: Information on the FIP conditions at the Swiss private railways. country: - switzerland diff --git a/content/operator/sp/index.fr.md b/content/operator/sp/index.fr.md index 693deeb33..4c6273006 100644 --- a/content/operator/sp/index.fr.md +++ b/content/operator/sp/index.fr.md @@ -1,5 +1,6 @@ --- title: Schweizer Privatbahnen +shortName: SP description: Informations sur les conditions FIP des chemins de fer privés suisses. country: - switzerland diff --git a/content/operator/stl/index.de.md b/content/operator/stl/index.de.md index dabb680f6..676667966 100644 --- a/content/operator/stl/index.de.md +++ b/content/operator/stl/index.de.md @@ -1,5 +1,6 @@ --- title: Stena Line BV +shortName: Stena Line BV country: - netherlands - united-kingdom diff --git a/content/operator/stl/index.en.md b/content/operator/stl/index.en.md index 94c8cbfa3..d62b3ba6a 100644 --- a/content/operator/stl/index.en.md +++ b/content/operator/stl/index.en.md @@ -1,5 +1,6 @@ --- title: Stena Line BV +shortName: Stena Line BV country: - netherlands - united-kingdom diff --git a/content/operator/stl/index.fr.md b/content/operator/stl/index.fr.md index b1a4c5c3f..9a3ee7a8a 100644 --- a/content/operator/stl/index.fr.md +++ b/content/operator/stl/index.fr.md @@ -1,5 +1,6 @@ --- title: Stena Line BV +shortName: Stena Line BV country: - netherlands - united-kingdom diff --git a/content/operator/sv/index.de.md b/content/operator/sv/index.de.md index b1c997cfc..4bfdde0fe 100644 --- a/content/operator/sv/index.de.md +++ b/content/operator/sv/index.de.md @@ -1,5 +1,6 @@ --- title: SV +shortName: SV country: - serbia operator: sv diff --git a/content/operator/sv/index.en.md b/content/operator/sv/index.en.md index 9312de0a8..e03a4d51f 100644 --- a/content/operator/sv/index.en.md +++ b/content/operator/sv/index.en.md @@ -1,5 +1,6 @@ --- title: SV +shortName: SV country: - serbia operator: sv diff --git a/content/operator/sv/index.fr.md b/content/operator/sv/index.fr.md index d0dc2502e..ec55c4a41 100644 --- a/content/operator/sv/index.fr.md +++ b/content/operator/sv/index.fr.md @@ -1,5 +1,6 @@ --- title: SV +shortName: SV country: - serbia operator: sv diff --git a/content/operator/sz/index.de.md b/content/operator/sz/index.de.md index 40589129e..5bd5a3394 100644 --- a/content/operator/sz/index.de.md +++ b/content/operator/sz/index.de.md @@ -1,5 +1,6 @@ --- title: SŽ +shortName: SŽ country: - slovenia operator: sz diff --git a/content/operator/sz/index.en.md b/content/operator/sz/index.en.md index fd4e3ce65..fcf98e66a 100644 --- a/content/operator/sz/index.en.md +++ b/content/operator/sz/index.en.md @@ -1,5 +1,6 @@ --- title: SŽ +shortName: SŽ country: - slovenia operator: sz diff --git a/content/operator/sz/index.fr.md b/content/operator/sz/index.fr.md index a16816877..2b34e5929 100644 --- a/content/operator/sz/index.fr.md +++ b/content/operator/sz/index.fr.md @@ -1,5 +1,6 @@ --- title: SŽ +shortName: SŽ country: - slovenia operator: sz diff --git a/content/operator/vy/index.de.md b/content/operator/vy/index.de.md index 20ea7a08c..2ea262ffd 100644 --- a/content/operator/vy/index.de.md +++ b/content/operator/vy/index.de.md @@ -1,5 +1,6 @@ --- title: Vy Group +shortName: Vy country: - norway operator: vy diff --git a/content/operator/vy/index.en.md b/content/operator/vy/index.en.md index 9832a8c6e..94616f4e4 100644 --- a/content/operator/vy/index.en.md +++ b/content/operator/vy/index.en.md @@ -1,5 +1,6 @@ --- title: Vy Group +shortName: Vy country: - norway operator: vy diff --git a/content/operator/vy/index.fr.md b/content/operator/vy/index.fr.md index 0f710f008..9e1fc5bd9 100644 --- a/content/operator/vy/index.fr.md +++ b/content/operator/vy/index.fr.md @@ -1,5 +1,6 @@ --- title: Vy Group +shortName: Vy country: - norway operator: vy diff --git a/content/operator/zfbh/index.de.md b/content/operator/zfbh/index.de.md index f8b128f88..4eb59de8b 100644 --- a/content/operator/zfbh/index.de.md +++ b/content/operator/zfbh/index.de.md @@ -1,5 +1,6 @@ --- title: "ŽFBH" +shortName: ŽFBH country: - "bosnia-and-herzegovina" operator: "žfbh" diff --git a/content/operator/zfbh/index.en.md b/content/operator/zfbh/index.en.md index 172fcf900..c3bd8b52c 100644 --- a/content/operator/zfbh/index.en.md +++ b/content/operator/zfbh/index.en.md @@ -1,5 +1,6 @@ --- title: "ŽFBH" +shortName: ŽFBH country: - "bosnia-and-herzegovina" operator: "žfbh" diff --git a/content/operator/zfbh/index.fr.md b/content/operator/zfbh/index.fr.md index 73c4e529a..0db441df6 100644 --- a/content/operator/zfbh/index.fr.md +++ b/content/operator/zfbh/index.fr.md @@ -1,5 +1,6 @@ --- title: "ŽFBH" +shortName: ŽFBH country: - "bosnia-and-herzegovina" operator: "žfbh" diff --git a/content/operator/zpcg/index.de.md b/content/operator/zpcg/index.de.md index eec595892..be7f4c745 100644 --- a/content/operator/zpcg/index.de.md +++ b/content/operator/zpcg/index.de.md @@ -1,5 +1,6 @@ --- title: ŽPCG +shortName: ŽPCG country: - montenegro operator: zpcg diff --git a/content/operator/zpcg/index.en.md b/content/operator/zpcg/index.en.md index 71421d195..d71f61387 100644 --- a/content/operator/zpcg/index.en.md +++ b/content/operator/zpcg/index.en.md @@ -1,5 +1,6 @@ --- title: ŽPCG +shortName: ŽPCG country: - montenegro operator: zpcg diff --git a/content/operator/zpcg/index.fr.md b/content/operator/zpcg/index.fr.md index 13fd7d2c1..f642bdaee 100644 --- a/content/operator/zpcg/index.fr.md +++ b/content/operator/zpcg/index.fr.md @@ -1,5 +1,6 @@ --- title: ŽPCG +shortName: ŽPCG country: - montenegro operator: zpcg diff --git a/content/operator/zrs/index.de.md b/content/operator/zrs/index.de.md index 929b5cf58..75dfb1799 100644 --- a/content/operator/zrs/index.de.md +++ b/content/operator/zrs/index.de.md @@ -1,5 +1,6 @@ --- title: "ŽRS" +shortName: ŽRS country: - "bosnia-and-herzegovina" operator: "žrs" diff --git a/content/operator/zrs/index.en.md b/content/operator/zrs/index.en.md index 79e1682c6..60015dd27 100644 --- a/content/operator/zrs/index.en.md +++ b/content/operator/zrs/index.en.md @@ -1,5 +1,6 @@ --- title: "ŽRS" +shortName: ŽRS country: - "bosnia-and-herzegovina" operator: "žrs" diff --git a/content/operator/zrs/index.fr.md b/content/operator/zrs/index.fr.md index 92c21030f..1a90b8284 100644 --- a/content/operator/zrs/index.fr.md +++ b/content/operator/zrs/index.fr.md @@ -1,5 +1,6 @@ --- title: "ŽRS" +shortName: ŽRS country: - "bosnia-and-herzegovina" operator: "žrs" diff --git a/content/operator/zssk/index.de.md b/content/operator/zssk/index.de.md index bb0b1f0cf..742070e85 100644 --- a/content/operator/zssk/index.de.md +++ b/content/operator/zssk/index.de.md @@ -1,5 +1,6 @@ --- title: ZSSK / ŽSR +shortName: ZSSK / ŽSR country: - slovakia operator: zssk diff --git a/content/operator/zssk/index.en.md b/content/operator/zssk/index.en.md index e6b0bebbf..81ee770f3 100644 --- a/content/operator/zssk/index.en.md +++ b/content/operator/zssk/index.en.md @@ -1,5 +1,6 @@ --- title: ZSSK / ZSR +shortName: ZSSK / ŽSR country: - slovakia operator: zssk diff --git a/content/operator/zssk/index.fr.md b/content/operator/zssk/index.fr.md index 599ea43fb..21bfbdb2b 100644 --- a/content/operator/zssk/index.fr.md +++ b/content/operator/zssk/index.fr.md @@ -1,5 +1,6 @@ --- title: ZSSK / ZSR +shortName: ZSSK / ŽSR country: - slovakia operator: zssk diff --git a/layouts/_partials/helper/borderPointsRefs.html b/layouts/_partials/helper/borderPointsRefs.html index 7d0ad8953..7827cdda0 100644 --- a/layouts/_partials/helper/borderPointsRefs.html +++ b/layouts/_partials/helper/borderPointsRefs.html @@ -7,7 +7,9 @@ {{- $ref := "" -}} {{- with $id -}} {{- with site.GetPage (printf "/%s/%s" $prefix .) -}} - {{- if not $label }}{{ $label = .LinkTitle }}{{ end -}} + {{- if not $label -}} + {{- $label = .Params.shortName | default .LinkTitle -}} + {{- end -}} {{- $ref = printf "/%s/%s" $prefix $id -}} {{- end -}} {{- end -}} diff --git a/layouts/admin/section.cmsconfig.yml b/layouts/admin/section.cmsconfig.yml index f9075998d..9ef67c7a5 100644 --- a/layouts/admin/section.cmsconfig.yml +++ b/layouts/admin/section.cmsconfig.yml @@ -122,7 +122,7 @@ x_border_side: &border_side widget: "list" required: false i18n: true - summary: "{{"{{"}}fields.label}}" + summary: "{{"{{"}}fields.id}}{{"{{"}}fields.label}}" fields: - label: "Operator" name: "id" @@ -138,7 +138,7 @@ x_border_side: &border_side widget: "string" required: false i18n: true - hint: "Text shown in the table, e.g. “DB” instead of the full page title." + hint: "Only needed for operators without their own page. The short name shown for operators with a page is set on the operator page itself." collections: - name: "news" @@ -337,6 +337,12 @@ collections: name: "title" widget: "string" i18n: true + - label: "Short Name" + name: "shortName" + widget: "string" + required: false + i18n: true + hint: "Abbreviation shown in border point tables, e.g. “DB” instead of the full title. Falls back to the title if not set." - label: "Countries" name: "country" widget: "relation" From db3bd5f8a6e925ba3353133f2ddafa298d705903 Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Wed, 7 Oct 2026 22:07:51 +0200 Subject: [PATCH 04/16] refactor: change border side countries array to single country field --- content/country/borderpoints.de.yaml | 286 +++++++++--------- content/country/borderpoints.en.yaml | 286 +++++++++--------- content/country/borderpoints.fr.yaml | 286 +++++++++--------- .../_partials/helper/borderPointsRows.html | 6 +- .../helper/borderPointsSideLabel.html | 8 +- layouts/admin/section.cmsconfig.yml | 7 +- 6 files changed, 441 insertions(+), 438 deletions(-) diff --git a/content/country/borderpoints.de.yaml b/content/country/borderpoints.de.yaml index e61de887a..e78beb37d 100644 --- a/content/country/borderpoints.de.yaml +++ b/content/country/borderpoints.de.yaml @@ -97,10 +97,10 @@ countries: borders: - id: at-cz a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: czechia }] + country: { id: czechia } operators: [{ id: cd }] points: - "Bernhardsthal (Gr) / Břeclav (Gr)" @@ -110,10 +110,10 @@ borders: - id: at-sk a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: slovakia }] + country: { id: slovakia } operators: [{ id: zssk }] points: - "Marchegg (Gr)" @@ -121,10 +121,10 @@ borders: - id: at-hu-gysev a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: gysev }] b: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: gysev }] points: - "Pamhagen (Gr)" @@ -133,10 +133,10 @@ borders: - id: at-hu-mav a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }] points: - "Hegyeshalom (Gr)" @@ -145,10 +145,10 @@ borders: - id: at-si sort: true a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: slovenia }] + country: { id: slovenia } operators: [{ id: sz }] points: - "Bleiburg (Gr) (Slowenisch: Pliberk)" @@ -157,10 +157,10 @@ borders: - id: at-it a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: italy }] + country: { id: italy } operators: [{ id: fs }] points: - "Brennero/Brenner" @@ -169,10 +169,10 @@ borders: - id: at-ch a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: switzerland }] + country: { id: switzerland } operators: [{ id: sbb }] points: - "Buchs SG" @@ -181,10 +181,10 @@ borders: - id: at-de sort: true a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] points: - "Passau Hbf" @@ -196,10 +196,10 @@ borders: - id: be-nl a: - countries: [{ id: belgium }] + country: { id: belgium } operators: [{ id: sncb }] b: - countries: [{ id: netherlands }] + country: { id: netherlands } operators: [{ id: ns }] points: - "Roosendaal (fr)" @@ -207,20 +207,20 @@ borders: - id: be-de a: - countries: [{ id: belgium }] + country: { id: belgium } operators: [{ id: sncb }] b: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] points: - "Aachen Süd (Gr)" - id: be-lu a: - countries: [{ id: belgium }] + country: { id: belgium } operators: [{ id: sncb }] b: - countries: [{ id: luxembourg }] + country: { id: luxembourg } operators: [{ id: cfl }] points: - "Athus" @@ -229,10 +229,10 @@ borders: - id: be-fr a: - countries: [{ id: belgium }] + country: { id: belgium } operators: [{ id: sncb }] b: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] points: - "Blandain (fr)" @@ -243,10 +243,10 @@ borders: - id: ba-hr a: - countries: [{ id: bosnia-and-herzegovina }] + country: { id: bosnia-and-herzegovina } operators: [{ id: zfbh }, { id: zrs }] b: - countries: [{ label: Kroatien }] + country: { label: Kroatien } operators: [{ label: HŽ }] points: - "Brčko (Gr)" @@ -257,20 +257,20 @@ borders: - id: ba-rs a: - countries: [{ id: bosnia-and-herzegovina }] + country: { id: bosnia-and-herzegovina } operators: [{ id: zfbh }, { id: zrs }] b: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] points: - "Zvornik" - id: bg-ro a: - countries: [{ id: bulgaria }] + country: { id: bulgaria } operators: [{ id: bdz }] b: - countries: [{ id: romania }] + country: { id: romania } operators: [{ id: cfr }] points: - "Ruse (fr) (bulgarisch: Русе)" @@ -278,20 +278,20 @@ borders: - id: bg-tr a: - countries: [{ id: bulgaria }] + country: { id: bulgaria } operators: [{ id: bdz }] b: - countries: [{ label: Türkei }] + country: { label: Türkei } operators: [{ label: TCDD }] points: - "Kapikule (fr)" - id: bg-gr a: - countries: [{ id: bulgaria }] + country: { id: bulgaria } operators: [{ id: bdz }] b: - countries: [{ id: greece }] + country: { id: greece } operators: [{ id: ht }] points: - "Kulata (fr) (bulgarisch: Кулата)" @@ -299,20 +299,20 @@ borders: - id: bg-rs a: - countries: [{ id: bulgaria }] + country: { id: bulgaria } operators: [{ id: bdz }] b: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] points: - "Dimitrovgrad (fr) (bulgarisch: Цариброд, Tsaribrod)" - id: cz-pl a: - countries: [{ id: czechia }] + country: { id: czechia } operators: [{ id: cd }] b: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }, { id: kd }, { id: ks }] points: - "Bohumín (Gr)" @@ -325,10 +325,10 @@ borders: - id: cz-sk a: - countries: [{ id: czechia }] + country: { id: czechia } operators: [{ id: cd }] b: - countries: [{ id: slovakia }] + country: { id: slovakia } operators: [{ id: zssk }] points: - "Čadca (Gr)" @@ -342,10 +342,10 @@ borders: - id: cz-de sort: true a: - countries: [{ id: czechia }] + country: { id: czechia } operators: [{ id: cd }] b: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] points: - "Selb-Plößberg (Gr) / Aš (Gr)" @@ -364,20 +364,20 @@ borders: - id: dk-se a: - countries: [{ id: denmark }] + country: { id: denmark } operators: [{ id: dsb }] b: - countries: [{ label: Schweden }] + country: { label: Schweden } operators: [{ label: SJ }] points: - "Helsingborg (über Helsingør)" - id: dk-de a: - countries: [{ id: denmark }] + country: { id: denmark } operators: [{ id: dsb }] b: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] points: - "Flensburg (Gr)" @@ -387,10 +387,10 @@ borders: - id: de-se a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: - countries: [{ label: Schweden }] + country: { label: Schweden } operators: [{ label: SJ }] points: - "Lübeck-Travemünde Hafen" @@ -400,10 +400,10 @@ borders: - id: de-pl sort: true a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }] points: - "Ahlbeck (Gr)" @@ -418,7 +418,7 @@ borders: - id: de-bsb a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: operators: [{ id: bsb }] @@ -433,10 +433,10 @@ borders: - id: de-ch a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: - countries: [{ id: switzerland }] + country: { id: switzerland } operators: [{ id: sbb }, { id: bls }, { id: sp }] points: - "Basel Bad Bf" @@ -446,10 +446,10 @@ borders: - id: de-fr a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] points: - "Apach (fr)" @@ -462,17 +462,17 @@ borders: - id: de-lu a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: - countries: [{ id: luxembourg }] + country: { id: luxembourg } operators: [{ id: cfl }] points: - "Igel (Gr)" - id: de-eurostar a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: operators: [{ id: eurostar }] @@ -486,10 +486,10 @@ borders: - id: de-nl a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: - countries: [{ id: netherlands }] + country: { id: netherlands } operators: [{ id: ns }] points: - "Bad Bentheim (Gr)" @@ -501,30 +501,30 @@ borders: - id: gr-mk a: - countries: [{ id: greece }] + country: { id: greece } operators: [{ id: ht }] b: - countries: [{ label: Nordmazedonien }] + country: { label: Nordmazedonien } operators: [{ label: ŽRSM }] points: - "Gevgelija (fr)" - id: gr-tr a: - countries: [{ id: greece }] + country: { id: greece } operators: [{ id: ht }] b: - countries: [{ label: Türkei }] + country: { label: Türkei } operators: [{ label: TCDD }] points: - "Pythio (Πύθιο)" - id: gr-it a: - countries: [{ id: greece }] + country: { id: greece } operators: [{ id: attica }] b: - countries: [{ id: italy }] + country: { id: italy } operators: [{ id: attica }] points: - "Patras (Πάτρα) [>Ancona, >Bari]" @@ -533,10 +533,10 @@ borders: - id: hu-sk-mav a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }] b: - countries: [{ id: slovakia }] + country: { id: slovakia } operators: [{ id: zssk }] points: - "Bánréve (Gr)" @@ -548,30 +548,30 @@ borders: - id: hu-sk-gysev a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: gysev }] b: - countries: [{ id: slovakia }] + country: { id: slovakia } operators: [{ id: gysev }] points: - "Rajka (Gr)" - id: hu-ua a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }] b: - countries: [{ label: Ukraine }] + country: { label: Ukraine } operators: [{ label: UZ }] points: - "Záhony (Gr)" - id: hu-ro a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }] b: - countries: [{ id: romania }] + country: { id: romania } operators: [{ id: cfr }] points: - "Biharkeresztes (fr)" @@ -581,10 +581,10 @@ borders: - id: hu-rs a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }] b: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] points: - "Röszke (Gr)" @@ -592,10 +592,10 @@ borders: - id: hu-hr a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }] b: - countries: [{ label: Kroatien }] + country: { label: Kroatien } operators: [{ label: HŽ }] points: - "Koprivnica (Gr)" @@ -604,30 +604,30 @@ borders: - id: hu-si a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }, { id: gysev }] b: - countries: [{ id: slovenia }] + country: { id: slovenia } operators: [{ id: sz }] points: - "Hodoš (Gr) (Őrihodos)" - id: ie-gb-rail a: - countries: [{ id: ireland }] + country: { id: ireland } operators: [{ id: cie }] b: - countries: [{ id: united-kingdom }] + country: { id: united-kingdom } operators: [{ id: nir }] points: - "Dundalk" - id: ie-gb-sll a: - countries: [{ id: ireland }] + country: { id: ireland } operators: [{ id: sll }] b: - countries: [{ id: united-kingdom }] + country: { id: united-kingdom } operators: [{ id: sll }] points: - "Dublin Bay / Holyhead" @@ -635,10 +635,10 @@ borders: - id: it-si a: - countries: [{ id: italy }] + country: { id: italy } operators: [{ id: fs }] b: - countries: [{ id: slovenia }] + country: { id: slovenia } operators: [{ id: sz }] points: - "Nova Gorica (fr)" @@ -646,10 +646,10 @@ borders: - id: fr-it a: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] b: - countries: [{ id: italy }] + country: { id: italy } operators: [{ id: fs }] points: - "Limone-Confine" @@ -660,10 +660,10 @@ borders: - id: it-ch sort: true a: - countries: [{ id: italy }] + country: { id: italy } operators: [{ id: fs }] b: - countries: [{ id: switzerland }] + country: { id: switzerland } operators: [{ id: sbb }, { id: bls }, { id: sp }] points: - "Chiasso" @@ -679,10 +679,10 @@ borders: - id: fr-ch a: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] b: - countries: [{ id: switzerland }] + country: { id: switzerland } operators: [{ id: sbb }, { id: bls }, { id: sp }] points: - "Annemasse" @@ -696,10 +696,10 @@ borders: - id: lu-fr a: - countries: [{ id: luxembourg }] + country: { id: luxembourg } operators: [{ id: cfl }] b: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] points: - "Bettembourg (fr)" @@ -707,10 +707,10 @@ borders: - id: es-fr a: - countries: [{ id: spain }] + country: { id: spain } operators: [{ id: renfe }] b: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] points: - "Canfranc (fr)" @@ -720,7 +720,7 @@ borders: - id: fr-eurostar a: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] b: operators: [{ id: eurostar }] @@ -730,30 +730,30 @@ borders: - id: gb-eurostar a: - countries: [{ id: united-kingdom }] + country: { id: united-kingdom } operators: [{ id: gb }] b: - countries: [{ id: france }, { id: belgium }, { id: netherlands }] + country: { id: france } operators: [{ id: eurostar }] points: - "London St. Pancras International" - id: nl-gb-stl a: - countries: [{ id: netherlands }] + country: { id: netherlands } operators: [{ id: stl }] b: - countries: [{ id: united-kingdom }] + country: { id: united-kingdom } operators: [{ id: stl }] points: - "Hoek van Holland / Harwich P.Q." - id: gb-gb-sll a: - countries: [{ id: united-kingdom }] + country: { id: united-kingdom } operators: [{ id: sll }] b: - countries: [{ id: united-kingdom }] + country: { id: united-kingdom } operators: [{ id: sll }] points: - "Cairnryan" @@ -762,85 +762,85 @@ borders: - id: lv-ee a: - countries: [{ id: latvia }] + country: { id: latvia } operators: [{ label: LDz }] b: - countries: [{ label: Estland }] + country: { label: Estland } points: - "Valga" - id: lv-ru a: - countries: [{ id: latvia }] + country: { id: latvia } operators: [{ label: LDz }] b: - countries: [{ label: Russland }] + country: { label: Russland } points: - "Grenze gesperrt" - id: lv-by a: - countries: [{ id: latvia }] + country: { id: latvia } operators: [{ label: LDz }] b: - countries: [{ label: Belarus/Weißrussland }] + country: { label: Belarus/Weißrussland } points: - "Grenze gesperrt" - id: lv-lt a: - countries: [{ id: latvia }] + country: { id: latvia } operators: [{ label: LDz }] b: - countries: [{ id: lithuania }] + country: { id: lithuania } operators: [{ id: ltg }] points: - "Joniškis" - id: lt-by a: - countries: [{ id: lithuania }] + country: { id: lithuania } operators: [{ id: ltg }] b: - countries: [{ label: Belarus/Weißrussland }] + country: { label: Belarus/Weißrussland } points: - "Grenze gesperrt" - id: lt-pl a: - countries: [{ id: lithuania }] + country: { id: lithuania } operators: [{ id: ltg }] b: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }] points: - "Mockava (Gr)" - id: lt-ru a: - countries: [{ id: lithuania }] + country: { id: lithuania } operators: [{ id: ltg }] b: - countries: [{ label: Russland }] + country: { label: Russland } points: - "Kein Ein-/Ausstieg im Transitverkehr Russland-Belarus-Litauen-Kaliningrad" - id: me-rs a: - countries: [{ id: montenegro }] + country: { id: montenegro } operators: [{ id: zpcg }] b: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] points: - "Bijelo Polje (Gr)" - id: no-se a: - countries: [{ id: norway }] + country: { id: norway } operators: [{ id: vy }] b: - countries: [{ label: Schweden }] + country: { label: Schweden } operators: [{ label: SJ }] points: - "Bjørnfjell (Gr)" @@ -850,20 +850,20 @@ borders: - id: pl-ru a: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }] b: - countries: [{ label: Russland }] + country: { label: Russland } operators: [{ label: RZD }] points: - "Braniewo (Gr)" - id: pl-by a: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }] b: - countries: [{ label: Belarus / Weißrussland }] + country: { label: Belarus / Weißrussland } operators: [{ label: BC }] points: - "Brest (Gr) (Брэст)" @@ -872,10 +872,10 @@ borders: - id: pl-ua a: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }] b: - countries: [{ label: Ukraine }] + country: { label: Ukraine } operators: [{ label: UZ }] points: - "Jagodin (Gr) (Yahodyn, Yagodyn oder Ягодин)" @@ -883,30 +883,30 @@ borders: - id: pl-sk a: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }] b: - countries: [{ id: slovakia }] + country: { id: slovakia } operators: [{ id: zssk }] points: - "Lupkow (Gr)" - id: ro-ua a: - countries: [{ id: romania }] + country: { id: romania } operators: [{ id: cfr }] b: - countries: [{ label: Ukraine }] + country: { label: Ukraine } operators: [{ label: UZ }] points: - "Vicsani (fr)" - id: ro-md a: - countries: [{ id: romania }] + country: { id: romania } operators: [{ id: cfr }] b: - countries: [{ label: Moldau }] + country: { label: Moldau } operators: [{ label: CFM }] points: - "Iasi" @@ -914,10 +914,10 @@ borders: - id: ro-rs a: - countries: [{ id: romania }] + country: { id: romania } operators: [{ id: cfr }] b: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] points: - "Jimbolia (fr) (serbisch: Жомбољ)" @@ -925,20 +925,20 @@ borders: - id: rs-mk a: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] b: - countries: [{ label: Nordmazedonien }] + country: { label: Nordmazedonien } operators: [{ label: ŽRSM }] points: - "Tabanovci (fr) (Serbisch: Табановце; Albanisch: Tabanoc)" - id: rs-hr a: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] b: - countries: [{ label: Kroatien }] + country: { label: Kroatien } operators: [{ label: HŽ }] points: - "Erdut (Gr) (Serbisch: Ердут)" @@ -946,10 +946,10 @@ borders: - id: si-hr a: - countries: [{ id: slovenia }] + country: { id: slovenia } operators: [{ id: sz }] b: - countries: [{ label: Kroatien }] + country: { label: Kroatien } operators: [{ label: HŽ }] points: - "Buzet (Gr)" @@ -963,10 +963,10 @@ borders: - id: pt-es a: - countries: [{ id: portugal }] + country: { id: portugal } operators: [{ id: cp }] b: - countries: [{ id: spain }] + country: { id: spain } operators: [{ id: renfe }] points: - "Badajoz (fr)" diff --git a/content/country/borderpoints.en.yaml b/content/country/borderpoints.en.yaml index b831dd1e4..722685170 100644 --- a/content/country/borderpoints.en.yaml +++ b/content/country/borderpoints.en.yaml @@ -97,10 +97,10 @@ countries: borders: - id: at-cz a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: czechia }] + country: { id: czechia } operators: [{ id: cd }] points: - "Bernhardsthal (GR) / Břeclav (Gr)" @@ -110,10 +110,10 @@ borders: - id: at-sk a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: slovakia }] + country: { id: slovakia } operators: [{ id: zssk }] points: - "Marchegg (Gr)" @@ -121,10 +121,10 @@ borders: - id: at-hu-gysev a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: gysev }] b: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: gysev }] points: - "Pamhagen (Gr)" @@ -133,10 +133,10 @@ borders: - id: at-hu-mav a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }] points: - "Hegyeshalom (Gr)" @@ -145,10 +145,10 @@ borders: - id: at-si sort: true a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: slovenia }] + country: { id: slovenia } operators: [{ id: sz }] points: - "Bleiburg (Gr) (Slovenian: Pliberk)" @@ -157,10 +157,10 @@ borders: - id: at-it a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: italy }] + country: { id: italy } operators: [{ id: fs }] points: - "Brennero/Brenner" @@ -169,10 +169,10 @@ borders: - id: at-ch a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: switzerland }] + country: { id: switzerland } operators: [{ id: sbb }] points: - "Buchs SG" @@ -181,10 +181,10 @@ borders: - id: at-de sort: true a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] points: - "Passau Hbf" @@ -196,10 +196,10 @@ borders: - id: be-nl a: - countries: [{ id: belgium }] + country: { id: belgium } operators: [{ id: sncb }] b: - countries: [{ id: netherlands }] + country: { id: netherlands } operators: [{ id: ns }] points: - "Roosendaal (fr)" @@ -207,20 +207,20 @@ borders: - id: be-de a: - countries: [{ id: belgium }] + country: { id: belgium } operators: [{ id: sncb }] b: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] points: - "Aachen Süd (Gr)" - id: be-lu a: - countries: [{ id: belgium }] + country: { id: belgium } operators: [{ id: sncb }] b: - countries: [{ id: luxembourg }] + country: { id: luxembourg } operators: [{ id: cfl }] points: - "Athus" @@ -229,10 +229,10 @@ borders: - id: be-fr a: - countries: [{ id: belgium }] + country: { id: belgium } operators: [{ id: sncb }] b: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] points: - "Blandain (fr)" @@ -243,10 +243,10 @@ borders: - id: ba-hr a: - countries: [{ id: bosnia-and-herzegovina }] + country: { id: bosnia-and-herzegovina } operators: [{ id: zfbh }, { id: zrs }] b: - countries: [{ label: Croatia }] + country: { label: Croatia } operators: [{ label: HŽ }] points: - "Brčko (Gr)" @@ -257,20 +257,20 @@ borders: - id: ba-rs a: - countries: [{ id: bosnia-and-herzegovina }] + country: { id: bosnia-and-herzegovina } operators: [{ id: zfbh }, { id: zrs }] b: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] points: - "Zvornik" - id: bg-ro a: - countries: [{ id: bulgaria }] + country: { id: bulgaria } operators: [{ id: bdz }] b: - countries: [{ id: romania }] + country: { id: romania } operators: [{ id: cfr }] points: - "Ruse (fr) (Bulgarian: Русе)" @@ -278,20 +278,20 @@ borders: - id: bg-tr a: - countries: [{ id: bulgaria }] + country: { id: bulgaria } operators: [{ id: bdz }] b: - countries: [{ label: Turkey }] + country: { label: Turkey } operators: [{ label: TCDD }] points: - "Kapikule (fr)" - id: bg-gr a: - countries: [{ id: bulgaria }] + country: { id: bulgaria } operators: [{ id: bdz }] b: - countries: [{ id: greece }] + country: { id: greece } operators: [{ id: ht }] points: - "Kulata (fr) (Bulgarian: Кулата)" @@ -299,20 +299,20 @@ borders: - id: bg-rs a: - countries: [{ id: bulgaria }] + country: { id: bulgaria } operators: [{ id: bdz }] b: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] points: - "Dimitrovgrad (fr) (Bulgarian: Цариброд, Tsaribrod)" - id: cz-pl a: - countries: [{ id: czechia }] + country: { id: czechia } operators: [{ id: cd }] b: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }, { id: kd }, { id: ks }] points: - "Bohumín (Gr)" @@ -325,10 +325,10 @@ borders: - id: cz-sk a: - countries: [{ id: czechia }] + country: { id: czechia } operators: [{ id: cd }] b: - countries: [{ id: slovakia }] + country: { id: slovakia } operators: [{ id: zssk }] points: - "Čadca (Gr)" @@ -342,10 +342,10 @@ borders: - id: cz-de sort: true a: - countries: [{ id: czechia }] + country: { id: czechia } operators: [{ id: cd }] b: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] points: - "Selb-Plößberg(Gr) / Aš (Gr)" @@ -364,20 +364,20 @@ borders: - id: dk-se a: - countries: [{ id: denmark }] + country: { id: denmark } operators: [{ id: dsb }] b: - countries: [{ label: Sweden }] + country: { label: Sweden } operators: [{ label: SJ }] points: - "Helsingborg (via Helsingør)" - id: dk-de a: - countries: [{ id: denmark }] + country: { id: denmark } operators: [{ id: dsb }] b: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] points: - "Flensburg (Gr)" @@ -387,10 +387,10 @@ borders: - id: de-se a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: - countries: [{ label: Sweden }] + country: { label: Sweden } operators: [{ label: SJ }] points: - "Lübeck-Travemünde Hafen" @@ -400,10 +400,10 @@ borders: - id: de-pl sort: true a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }] points: - "Ahlbeck (Gr)" @@ -418,7 +418,7 @@ borders: - id: de-bsb a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: operators: [{ id: bsb }] @@ -433,10 +433,10 @@ borders: - id: de-ch a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: - countries: [{ id: switzerland }] + country: { id: switzerland } operators: [{ id: sbb }, { id: bls }, { id: sp }] points: - "Basel Bad Bf" @@ -446,10 +446,10 @@ borders: - id: de-fr a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] points: - "Apach (fr)" @@ -462,17 +462,17 @@ borders: - id: de-lu a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: - countries: [{ id: luxembourg }] + country: { id: luxembourg } operators: [{ id: cfl }] points: - "Igel (Gr)" - id: de-eurostar a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: operators: [{ id: eurostar }] @@ -486,10 +486,10 @@ borders: - id: de-nl a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: - countries: [{ id: netherlands }] + country: { id: netherlands } operators: [{ id: ns }] points: - "Bad Bentheim (Gr)" @@ -501,30 +501,30 @@ borders: - id: gr-mk a: - countries: [{ id: greece }] + country: { id: greece } operators: [{ id: ht }] b: - countries: [{ label: North Macedonia }] + country: { label: North Macedonia } operators: [{ label: ŽRSM }] points: - "Gevgelija (fr)" - id: gr-tr a: - countries: [{ id: greece }] + country: { id: greece } operators: [{ id: ht }] b: - countries: [{ label: Turkey }] + country: { label: Turkey } operators: [{ label: TCDD }] points: - "Pythio (Πύθιο)" - id: gr-it a: - countries: [{ id: greece }] + country: { id: greece } operators: [{ id: attica }] b: - countries: [{ id: italy }] + country: { id: italy } operators: [{ id: attica }] points: - "Patras (Πάτρα) [>Ancona, >Bari]" @@ -533,10 +533,10 @@ borders: - id: hu-sk-mav a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }] b: - countries: [{ id: slovakia }] + country: { id: slovakia } operators: [{ id: zssk }] points: - "Bánréve (Gr)" @@ -548,30 +548,30 @@ borders: - id: hu-sk-gysev a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: gysev }] b: - countries: [{ id: slovakia }] + country: { id: slovakia } operators: [{ id: gysev }] points: - "Rajka (Gr)" - id: hu-ua a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }] b: - countries: [{ label: Ukraine }] + country: { label: Ukraine } operators: [{ label: UZ }] points: - "Záhony (Gr)" - id: hu-ro a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }] b: - countries: [{ id: romania }] + country: { id: romania } operators: [{ id: cfr }] points: - "Biharkeresztes (fr)" @@ -581,10 +581,10 @@ borders: - id: hu-rs a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }] b: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] points: - "Röszke (Gr)" @@ -592,10 +592,10 @@ borders: - id: hu-hr a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }] b: - countries: [{ label: Croatia }] + country: { label: Croatia } operators: [{ label: HŽ }] points: - "Koprivnica (Gr)" @@ -604,30 +604,30 @@ borders: - id: hu-si a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }, { id: gysev }] b: - countries: [{ id: slovenia }] + country: { id: slovenia } operators: [{ id: sz }] points: - "Hodoš (Gr) (Őrihodos)" - id: ie-gb-rail a: - countries: [{ id: ireland }] + country: { id: ireland } operators: [{ id: cie }] b: - countries: [{ id: united-kingdom }] + country: { id: united-kingdom } operators: [{ id: nir }] points: - "Dundalk" - id: ie-gb-sll a: - countries: [{ id: ireland }] + country: { id: ireland } operators: [{ id: sll }] b: - countries: [{ id: united-kingdom }] + country: { id: united-kingdom } operators: [{ id: sll }] points: - "Dublin Bay / Holyhead" @@ -635,10 +635,10 @@ borders: - id: it-si a: - countries: [{ id: italy }] + country: { id: italy } operators: [{ id: fs }] b: - countries: [{ id: slovenia }] + country: { id: slovenia } operators: [{ id: sz }] points: - "Nova Gorica (fr)" @@ -646,10 +646,10 @@ borders: - id: fr-it a: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] b: - countries: [{ id: italy }] + country: { id: italy } operators: [{ id: fs }] points: - "Limone-Confine" @@ -660,10 +660,10 @@ borders: - id: it-ch sort: true a: - countries: [{ id: italy }] + country: { id: italy } operators: [{ id: fs }] b: - countries: [{ id: switzerland }] + country: { id: switzerland } operators: [{ id: sbb }, { id: bls }, { id: sp }] points: - "Chiasso" @@ -679,10 +679,10 @@ borders: - id: fr-ch a: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] b: - countries: [{ id: switzerland }] + country: { id: switzerland } operators: [{ id: sbb }, { id: bls }, { id: sp }] points: - "Annemasse" @@ -696,10 +696,10 @@ borders: - id: lu-fr a: - countries: [{ id: luxembourg }] + country: { id: luxembourg } operators: [{ id: cfl }] b: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] points: - "Bettembourg (fr)" @@ -707,10 +707,10 @@ borders: - id: es-fr a: - countries: [{ id: spain }] + country: { id: spain } operators: [{ id: renfe }] b: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] points: - "Canfranc (fr)" @@ -720,7 +720,7 @@ borders: - id: fr-eurostar a: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] b: operators: [{ id: eurostar }] @@ -730,30 +730,30 @@ borders: - id: gb-eurostar a: - countries: [{ id: united-kingdom }] + country: { id: united-kingdom } operators: [{ id: gb }] b: - countries: [{ id: france }, { id: belgium }, { id: netherlands }] + country: { id: france } operators: [{ id: eurostar }] points: - "London St. Pancras International" - id: nl-gb-stl a: - countries: [{ id: netherlands }] + country: { id: netherlands } operators: [{ id: stl }] b: - countries: [{ id: united-kingdom }] + country: { id: united-kingdom } operators: [{ id: stl }] points: - "Hoek van Holland / Harwich P.Q." - id: gb-gb-sll a: - countries: [{ id: united-kingdom }] + country: { id: united-kingdom } operators: [{ id: sll }] b: - countries: [{ id: united-kingdom }] + country: { id: united-kingdom } operators: [{ id: sll }] points: - "Cairnryan" @@ -762,85 +762,85 @@ borders: - id: lv-ee a: - countries: [{ id: latvia }] + country: { id: latvia } operators: [{ label: LDz }] b: - countries: [{ label: Estonia }] + country: { label: Estonia } points: - "Valga" - id: lv-ru a: - countries: [{ id: latvia }] + country: { id: latvia } operators: [{ label: LDz }] b: - countries: [{ label: Russia }] + country: { label: Russia } points: - "Border closed" - id: lv-by a: - countries: [{ id: latvia }] + country: { id: latvia } operators: [{ label: LDz }] b: - countries: [{ label: Belarus }] + country: { label: Belarus } points: - "Border closed" - id: lv-lt a: - countries: [{ id: latvia }] + country: { id: latvia } operators: [{ label: LDz }] b: - countries: [{ id: lithuania }] + country: { id: lithuania } operators: [{ id: ltg }] points: - "Joniškis" - id: lt-by a: - countries: [{ id: lithuania }] + country: { id: lithuania } operators: [{ id: ltg }] b: - countries: [{ label: Belarus }] + country: { label: Belarus } points: - "Border closed" - id: lt-pl a: - countries: [{ id: lithuania }] + country: { id: lithuania } operators: [{ id: ltg }] b: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }] points: - "Mockava (Gr)" - id: lt-ru a: - countries: [{ id: lithuania }] + country: { id: lithuania } operators: [{ id: ltg }] b: - countries: [{ label: Russia }] + country: { label: Russia } points: - "No boarding/alighting in transit traffic Russia-Belarus-Lithuania-Kaliningrad" - id: me-rs a: - countries: [{ id: montenegro }] + country: { id: montenegro } operators: [{ id: zpcg }] b: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] points: - "Bijelo Polje (Gr)" - id: no-se a: - countries: [{ id: norway }] + country: { id: norway } operators: [{ id: vy }] b: - countries: [{ label: Sweden }] + country: { label: Sweden } operators: [{ label: SJ }] points: - "Bjørnfjell (Gr)" @@ -850,20 +850,20 @@ borders: - id: pl-ru a: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }] b: - countries: [{ label: Russia }] + country: { label: Russia } operators: [{ label: RZD }] points: - "Braniewo (Gr)" - id: pl-by a: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }] b: - countries: [{ label: Belarus }] + country: { label: Belarus } operators: [{ label: BC }] points: - "Brest (Gr) (Брэст)" @@ -872,10 +872,10 @@ borders: - id: pl-ua a: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }] b: - countries: [{ label: Ukraine }] + country: { label: Ukraine } operators: [{ label: UZ }] points: - "Jagodin (Gr) (Yahodyn, Yagodyn or Ягодин)" @@ -883,30 +883,30 @@ borders: - id: pl-sk a: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }] b: - countries: [{ id: slovakia }] + country: { id: slovakia } operators: [{ id: zssk }] points: - "Lupkow (Gr)" - id: ro-ua a: - countries: [{ id: romania }] + country: { id: romania } operators: [{ id: cfr }] b: - countries: [{ label: Ukraine }] + country: { label: Ukraine } operators: [{ label: UZ }] points: - "Vicsani (fr)" - id: ro-md a: - countries: [{ id: romania }] + country: { id: romania } operators: [{ id: cfr }] b: - countries: [{ label: Moldova }] + country: { label: Moldova } operators: [{ label: CFM }] points: - "Iasi" @@ -914,10 +914,10 @@ borders: - id: ro-rs a: - countries: [{ id: romania }] + country: { id: romania } operators: [{ id: cfr }] b: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] points: - "Jimbolia (fr) (Serbian: Жомбољ)" @@ -925,20 +925,20 @@ borders: - id: rs-mk a: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] b: - countries: [{ label: North Macedonia }] + country: { label: North Macedonia } operators: [{ label: ŽRSM }] points: - "Tabanovci (fr) (Serbian: Табановце; Albanian: Tabanoc)" - id: rs-hr a: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] b: - countries: [{ label: Croatia }] + country: { label: Croatia } operators: [{ label: HŽ }] points: - "Erdut (Gr) (Serbian: Ердут)" @@ -946,10 +946,10 @@ borders: - id: si-hr a: - countries: [{ id: slovenia }] + country: { id: slovenia } operators: [{ id: sz }] b: - countries: [{ label: Croatia }] + country: { label: Croatia } operators: [{ label: HŽ }] points: - "Buzet (Gr)" @@ -963,10 +963,10 @@ borders: - id: pt-es a: - countries: [{ id: portugal }] + country: { id: portugal } operators: [{ id: cp }] b: - countries: [{ id: spain }] + country: { id: spain } operators: [{ id: renfe }] points: - "Badajoz (fr)" diff --git a/content/country/borderpoints.fr.yaml b/content/country/borderpoints.fr.yaml index b78cad8fe..a3e96524e 100644 --- a/content/country/borderpoints.fr.yaml +++ b/content/country/borderpoints.fr.yaml @@ -97,10 +97,10 @@ countries: borders: - id: at-cz a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: czechia }] + country: { id: czechia } operators: [{ id: cd }] points: - "Bernhardsthal (Gr) / Břeclav (Gr)" @@ -110,10 +110,10 @@ borders: - id: at-sk a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: slovakia }] + country: { id: slovakia } operators: [{ id: zssk }] points: - "Marchegg (Gr)" @@ -121,10 +121,10 @@ borders: - id: at-hu-gysev a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: gysev }] b: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: gysev }] points: - "Pamhagen (Gr)" @@ -133,10 +133,10 @@ borders: - id: at-hu-mav a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }] points: - "Hegyeshalom (Gr)" @@ -145,10 +145,10 @@ borders: - id: at-si sort: true a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: slovenia }] + country: { id: slovenia } operators: [{ id: sz }] points: - "Bleiburg (Gr) (slovène : Pliberk)" @@ -157,10 +157,10 @@ borders: - id: at-it a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: italy }] + country: { id: italy } operators: [{ id: fs }] points: - "Brennero/Brenner" @@ -169,10 +169,10 @@ borders: - id: at-ch a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: switzerland }] + country: { id: switzerland } operators: [{ id: sbb }] points: - "Buchs SG" @@ -181,10 +181,10 @@ borders: - id: at-de sort: true a: - countries: [{ id: austria }] + country: { id: austria } operators: [{ id: oebb }] b: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] points: - "Passau Hbf" @@ -196,10 +196,10 @@ borders: - id: be-nl a: - countries: [{ id: belgium }] + country: { id: belgium } operators: [{ id: sncb }] b: - countries: [{ id: netherlands }] + country: { id: netherlands } operators: [{ id: ns }] points: - "Roosendaal (fr)" @@ -207,20 +207,20 @@ borders: - id: be-de a: - countries: [{ id: belgium }] + country: { id: belgium } operators: [{ id: sncb }] b: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] points: - "Aachen Süd (Gr)" - id: be-lu a: - countries: [{ id: belgium }] + country: { id: belgium } operators: [{ id: sncb }] b: - countries: [{ id: luxembourg }] + country: { id: luxembourg } operators: [{ id: cfl }] points: - "Athus" @@ -229,10 +229,10 @@ borders: - id: be-fr a: - countries: [{ id: belgium }] + country: { id: belgium } operators: [{ id: sncb }] b: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] points: - "Blandain (fr)" @@ -243,10 +243,10 @@ borders: - id: ba-hr a: - countries: [{ id: bosnia-and-herzegovina }] + country: { id: bosnia-and-herzegovina } operators: [{ id: zfbh }, { id: zrs }] b: - countries: [{ label: Croatie }] + country: { label: Croatie } operators: [{ label: HŽ }] points: - "Brčko (Gr)" @@ -257,20 +257,20 @@ borders: - id: ba-rs a: - countries: [{ id: bosnia-and-herzegovina }] + country: { id: bosnia-and-herzegovina } operators: [{ id: zfbh }, { id: zrs }] b: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] points: - "Zvornik" - id: bg-ro a: - countries: [{ id: bulgaria }] + country: { id: bulgaria } operators: [{ id: bdz }] b: - countries: [{ id: romania }] + country: { id: romania } operators: [{ id: cfr }] points: - "Ruse (fr) (bulgare : Русе)" @@ -278,20 +278,20 @@ borders: - id: bg-tr a: - countries: [{ id: bulgaria }] + country: { id: bulgaria } operators: [{ id: bdz }] b: - countries: [{ label: Turquie }] + country: { label: Turquie } operators: [{ label: TCDD }] points: - "Kapikule (fr)" - id: bg-gr a: - countries: [{ id: bulgaria }] + country: { id: bulgaria } operators: [{ id: bdz }] b: - countries: [{ id: greece }] + country: { id: greece } operators: [{ id: ht }] points: - "Kulata (fr) (bulgare : Кулата)" @@ -299,20 +299,20 @@ borders: - id: bg-rs a: - countries: [{ id: bulgaria }] + country: { id: bulgaria } operators: [{ id: bdz }] b: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] points: - "Dimitrovgrad (fr) (bulgare : Цариброд, Tsaribrod)" - id: cz-pl a: - countries: [{ id: czechia }] + country: { id: czechia } operators: [{ id: cd }] b: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }, { id: kd }, { id: ks }] points: - "Bohumín (Gr)" @@ -325,10 +325,10 @@ borders: - id: cz-sk a: - countries: [{ id: czechia }] + country: { id: czechia } operators: [{ id: cd }] b: - countries: [{ id: slovakia }] + country: { id: slovakia } operators: [{ id: zssk }] points: - "Čadca (Gr)" @@ -342,10 +342,10 @@ borders: - id: cz-de sort: true a: - countries: [{ id: czechia }] + country: { id: czechia } operators: [{ id: cd }] b: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] points: - "Selb-Plößberg (Gr) / Aš (Gr)" @@ -364,20 +364,20 @@ borders: - id: dk-se a: - countries: [{ id: denmark }] + country: { id: denmark } operators: [{ id: dsb }] b: - countries: [{ label: Suède }] + country: { label: Suède } operators: [{ label: SJ }] points: - "Helsingborg (via Helsingør)" - id: dk-de a: - countries: [{ id: denmark }] + country: { id: denmark } operators: [{ id: dsb }] b: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] points: - "Flensburg (Gr)" @@ -387,10 +387,10 @@ borders: - id: de-se a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: - countries: [{ label: Suède }] + country: { label: Suède } operators: [{ label: SJ }] points: - "Lübeck-Travemünde Hafen" @@ -400,10 +400,10 @@ borders: - id: de-pl sort: true a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }] points: - "Ahlbeck (Gr)" @@ -418,7 +418,7 @@ borders: - id: de-bsb a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: operators: [{ id: bsb }] @@ -433,10 +433,10 @@ borders: - id: de-ch a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: - countries: [{ id: switzerland }] + country: { id: switzerland } operators: [{ id: sbb }, { id: bls }, { id: sp }] points: - "Basel Bad Bf" @@ -446,10 +446,10 @@ borders: - id: de-fr a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] points: - "Apach (fr)" @@ -462,17 +462,17 @@ borders: - id: de-lu a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: - countries: [{ id: luxembourg }] + country: { id: luxembourg } operators: [{ id: cfl }] points: - "Igel (Gr)" - id: de-eurostar a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: operators: [{ id: eurostar }] @@ -486,10 +486,10 @@ borders: - id: de-nl a: - countries: [{ id: germany }] + country: { id: germany } operators: [{ id: db }] b: - countries: [{ id: netherlands }] + country: { id: netherlands } operators: [{ id: ns }] points: - "Bad Bentheim (Gr)" @@ -501,30 +501,30 @@ borders: - id: gr-mk a: - countries: [{ id: greece }] + country: { id: greece } operators: [{ id: ht }] b: - countries: [{ label: Macédoine du Nord }] + country: { label: Macédoine du Nord } operators: [{ label: ŽRSM }] points: - "Gevgelija (fr)" - id: gr-tr a: - countries: [{ id: greece }] + country: { id: greece } operators: [{ id: ht }] b: - countries: [{ label: Turquie }] + country: { label: Turquie } operators: [{ label: TCDD }] points: - "Pythio (Πύθιο)" - id: gr-it a: - countries: [{ id: greece }] + country: { id: greece } operators: [{ id: attica }] b: - countries: [{ id: italy }] + country: { id: italy } operators: [{ id: attica }] points: - "Patras (Πάτρα) [>Ancona, >Bari]" @@ -533,10 +533,10 @@ borders: - id: hu-sk-mav a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }] b: - countries: [{ id: slovakia }] + country: { id: slovakia } operators: [{ id: zssk }] points: - "Bánréve (Gr)" @@ -548,30 +548,30 @@ borders: - id: hu-sk-gysev a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: gysev }] b: - countries: [{ id: slovakia }] + country: { id: slovakia } operators: [{ id: gysev }] points: - "Rajka (Gr)" - id: hu-ua a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }] b: - countries: [{ label: Ukraine }] + country: { label: Ukraine } operators: [{ label: UZ }] points: - "Záhony (Gr)" - id: hu-ro a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }] b: - countries: [{ id: romania }] + country: { id: romania } operators: [{ id: cfr }] points: - "Biharkeresztes (fr)" @@ -581,10 +581,10 @@ borders: - id: hu-rs a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }] b: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] points: - "Röszke (Gr)" @@ -592,10 +592,10 @@ borders: - id: hu-hr a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }] b: - countries: [{ label: Croatie }] + country: { label: Croatie } operators: [{ label: HŽ }] points: - "Koprivnica (Gr)" @@ -604,30 +604,30 @@ borders: - id: hu-si a: - countries: [{ id: hungary }] + country: { id: hungary } operators: [{ id: mav }, { id: gysev }] b: - countries: [{ id: slovenia }] + country: { id: slovenia } operators: [{ id: sz }] points: - "Hodoš (Gr) (Őrihodos)" - id: ie-gb-rail a: - countries: [{ id: ireland }] + country: { id: ireland } operators: [{ id: cie }] b: - countries: [{ id: united-kingdom }] + country: { id: united-kingdom } operators: [{ id: nir }] points: - "Dundalk" - id: ie-gb-sll a: - countries: [{ id: ireland }] + country: { id: ireland } operators: [{ id: sll }] b: - countries: [{ id: united-kingdom }] + country: { id: united-kingdom } operators: [{ id: sll }] points: - "Dublin Bay / Holyhead" @@ -635,10 +635,10 @@ borders: - id: it-si a: - countries: [{ id: italy }] + country: { id: italy } operators: [{ id: fs }] b: - countries: [{ id: slovenia }] + country: { id: slovenia } operators: [{ id: sz }] points: - "Nova Gorica (fr)" @@ -646,10 +646,10 @@ borders: - id: fr-it a: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] b: - countries: [{ id: italy }] + country: { id: italy } operators: [{ id: fs }] points: - "Limone-Confine" @@ -660,10 +660,10 @@ borders: - id: it-ch sort: true a: - countries: [{ id: italy }] + country: { id: italy } operators: [{ id: fs }] b: - countries: [{ id: switzerland }] + country: { id: switzerland } operators: [{ id: sbb }, { id: bls }, { id: sp }] points: - "Chiasso" @@ -679,10 +679,10 @@ borders: - id: fr-ch a: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] b: - countries: [{ id: switzerland }] + country: { id: switzerland } operators: [{ id: sbb }, { id: bls }, { id: sp }] points: - "Annemasse" @@ -696,10 +696,10 @@ borders: - id: lu-fr a: - countries: [{ id: luxembourg }] + country: { id: luxembourg } operators: [{ id: cfl }] b: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] points: - "Bettembourg (fr)" @@ -707,10 +707,10 @@ borders: - id: es-fr a: - countries: [{ id: spain }] + country: { id: spain } operators: [{ id: renfe }] b: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] points: - "Canfranc (fr)" @@ -720,7 +720,7 @@ borders: - id: fr-eurostar a: - countries: [{ id: france }] + country: { id: france } operators: [{ id: sncf }] b: operators: [{ id: eurostar }] @@ -730,30 +730,30 @@ borders: - id: gb-eurostar a: - countries: [{ id: united-kingdom }] + country: { id: united-kingdom } operators: [{ id: gb }] b: - countries: [{ id: france }, { id: belgium }, { id: netherlands }] + country: { id: france } operators: [{ id: eurostar }] points: - "London St. Pancras International" - id: nl-gb-stl a: - countries: [{ id: netherlands }] + country: { id: netherlands } operators: [{ id: stl }] b: - countries: [{ id: united-kingdom }] + country: { id: united-kingdom } operators: [{ id: stl }] points: - "Hoek van Holland / Harwich P.Q." - id: gb-gb-sll a: - countries: [{ id: united-kingdom }] + country: { id: united-kingdom } operators: [{ id: sll }] b: - countries: [{ id: united-kingdom }] + country: { id: united-kingdom } operators: [{ id: sll }] points: - "Cairnryan" @@ -762,85 +762,85 @@ borders: - id: lv-ee a: - countries: [{ id: latvia }] + country: { id: latvia } operators: [{ label: LDz }] b: - countries: [{ label: Estonie }] + country: { label: Estonie } points: - "Valga" - id: lv-ru a: - countries: [{ id: latvia }] + country: { id: latvia } operators: [{ label: LDz }] b: - countries: [{ label: Russie }] + country: { label: Russie } points: - "Frontière fermée" - id: lv-by a: - countries: [{ id: latvia }] + country: { id: latvia } operators: [{ label: LDz }] b: - countries: [{ label: Biélorussie }] + country: { label: Biélorussie } points: - "Frontière fermée" - id: lv-lt a: - countries: [{ id: latvia }] + country: { id: latvia } operators: [{ label: LDz }] b: - countries: [{ id: lithuania }] + country: { id: lithuania } operators: [{ id: ltg }] points: - "Joniškis" - id: lt-by a: - countries: [{ id: lithuania }] + country: { id: lithuania } operators: [{ id: ltg }] b: - countries: [{ label: Biélorussie }] + country: { label: Biélorussie } points: - "Frontière fermée" - id: lt-pl a: - countries: [{ id: lithuania }] + country: { id: lithuania } operators: [{ id: ltg }] b: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }] points: - "Mockava (Gr)" - id: lt-ru a: - countries: [{ id: lithuania }] + country: { id: lithuania } operators: [{ id: ltg }] b: - countries: [{ label: Russie }] + country: { label: Russie } points: - "Pas de montée/descente en transit Russie-Biélorussie-Lituanie-Kaliningrad" - id: me-rs a: - countries: [{ id: montenegro }] + country: { id: montenegro } operators: [{ id: zpcg }] b: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] points: - "Bijelo Polje (Gr)" - id: no-se a: - countries: [{ id: norway }] + country: { id: norway } operators: [{ id: vy }] b: - countries: [{ label: Suède }] + country: { label: Suède } operators: [{ label: SJ }] points: - "Bjørnfjell (Gr)" @@ -850,20 +850,20 @@ borders: - id: pl-ru a: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }] b: - countries: [{ label: Russie }] + country: { label: Russie } operators: [{ label: RZD }] points: - "Braniewo (Gr)" - id: pl-by a: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }] b: - countries: [{ label: Biélorussie }] + country: { label: Biélorussie } operators: [{ label: BC }] points: - "Brest (Gr) (Брэст)" @@ -872,10 +872,10 @@ borders: - id: pl-ua a: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }] b: - countries: [{ label: Ukraine }] + country: { label: Ukraine } operators: [{ label: UZ }] points: - "Jagodin (Gr) (Yahodyn, Yagodyn ou Ягодин)" @@ -883,30 +883,30 @@ borders: - id: pl-sk a: - countries: [{ id: poland }] + country: { id: poland } operators: [{ id: pkp }] b: - countries: [{ id: slovakia }] + country: { id: slovakia } operators: [{ id: zssk }] points: - "Lupkow (Gr)" - id: ro-ua a: - countries: [{ id: romania }] + country: { id: romania } operators: [{ id: cfr }] b: - countries: [{ label: Ukraine }] + country: { label: Ukraine } operators: [{ label: UZ }] points: - "Vicsani (fr)" - id: ro-md a: - countries: [{ id: romania }] + country: { id: romania } operators: [{ id: cfr }] b: - countries: [{ label: Moldavie }] + country: { label: Moldavie } operators: [{ label: CFM }] points: - "Iasi" @@ -914,10 +914,10 @@ borders: - id: ro-rs a: - countries: [{ id: romania }] + country: { id: romania } operators: [{ id: cfr }] b: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] points: - "Jimbolia (fr) (serbe : Жомбољ)" @@ -925,20 +925,20 @@ borders: - id: rs-mk a: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] b: - countries: [{ label: Macédoine du Nord }] + country: { label: Macédoine du Nord } operators: [{ label: ŽRSM }] points: - "Tabanovci (fr) (serbe : Табановце ; albanais : Tabanoc)" - id: rs-hr a: - countries: [{ id: serbia }] + country: { id: serbia } operators: [{ id: sv }] b: - countries: [{ label: Croatie }] + country: { label: Croatie } operators: [{ label: HŽ }] points: - "Erdut (Gr) (serbe : Ердут)" @@ -946,10 +946,10 @@ borders: - id: si-hr a: - countries: [{ id: slovenia }] + country: { id: slovenia } operators: [{ id: sz }] b: - countries: [{ label: Croatie }] + country: { label: Croatie } operators: [{ label: HŽ }] points: - "Buzet (Gr)" @@ -963,10 +963,10 @@ borders: - id: pt-es a: - countries: [{ id: portugal }] + country: { id: portugal } operators: [{ id: cp }] b: - countries: [{ id: spain }] + country: { id: spain } operators: [{ id: renfe }] points: - "Badajoz (fr)" diff --git a/layouts/_partials/helper/borderPointsRows.html b/layouts/_partials/helper/borderPointsRows.html index 529acfadc..4368c871c 100644 --- a/layouts/_partials/helper/borderPointsRows.html +++ b/layouts/_partials/helper/borderPointsRows.html @@ -19,9 +19,9 @@ {{- $own := "" -}} {{- range $key := slice "a" "b" -}} {{- if not $own -}} - {{- range (index $border $key).countries -}} - {{- if eq .id $country }}{{ $own = $key }}{{ end -}} - {{- end -}} + {{- if eq (index $border $key).country.id $country }} + {{ $own = $key }} + {{ end -}} {{- end -}} {{- end -}} diff --git a/layouts/_partials/helper/borderPointsSideLabel.html b/layouts/_partials/helper/borderPointsSideLabel.html index 4597a47e4..7b112624b 100644 --- a/layouts/_partials/helper/borderPointsSideLabel.html +++ b/layouts/_partials/helper/borderPointsSideLabel.html @@ -1,9 +1,13 @@ {{- $side := .side -}} {{- $page := .page -}} -{{- $countries := partial "helper/borderPointsRefs" (dict "prefix" "country" "items" $side.countries "page" $page) -}} +{{- $countryItems := slice -}} +{{- with $side.country -}} + {{- $countryItems = slice . -}} +{{- end -}} +{{- $countryLabel := partial "helper/borderPointsRefs" (dict "prefix" "country" "items" $countryItems "page" $page) -}} {{- $operators := partial "helper/borderPointsRefs" (dict "prefix" "operator" "items" $side.operators "page" $page) -}} -{{- $out := delimit $countries ", " -}} +{{- $out := delimit $countryLabel ", " -}} {{- with $operators -}} {{- $joined := delimit . ", " -}} {{- $out = cond (ne $out "") (printf "%s (%s)" $out $joined) $joined -}} diff --git a/layouts/admin/section.cmsconfig.yml b/layouts/admin/section.cmsconfig.yml index 9ef67c7a5..a116b5f5c 100644 --- a/layouts/admin/section.cmsconfig.yml +++ b/layouts/admin/section.cmsconfig.yml @@ -95,12 +95,11 @@ x_fip_validity_columns: &fip_validity_columns fields: *fip_validity_target_fields_reduced x_border_side: &border_side - - label: "Countries" - name: "countries" - widget: "list" + - label: "Country" + name: "country" + widget: "object" required: false i18n: true - summary: "{{"{{"}}fields.id}}{{"{{"}}fields.label}}" fields: - label: "Country" name: "id" From 83be3c9203899247bbedf9004d81029ab565c6fa Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Wed, 7 Oct 2026 22:29:06 +0200 Subject: [PATCH 05/16] feat: remove BSB, Attica, Eurostar and Stena Line border points --- content/country/borderpoints.de.yaml | 124 ++------------------------- content/country/borderpoints.en.yaml | 124 ++------------------------- content/country/borderpoints.fr.yaml | 124 ++------------------------- 3 files changed, 21 insertions(+), 351 deletions(-) diff --git a/content/country/borderpoints.de.yaml b/content/country/borderpoints.de.yaml index e78beb37d..fbc1a3376 100644 --- a/content/country/borderpoints.de.yaml +++ b/content/country/borderpoints.de.yaml @@ -12,30 +12,14 @@ countries: denmark: order: [dk-se, dk-de] france: - order: [fr-eurostar, be-fr, lu-fr, de-fr, fr-ch, fr-it, es-fr] + order: [be-fr, lu-fr, de-fr, fr-ch, fr-it, es-fr] germany: order: - [ - dk-de, - de-se, - de-pl, - cz-de, - at-de, - de-bsb, - de-ch, - de-fr, - de-lu, - be-de, - de-eurostar, - de-nl, - ] + [dk-de, de-se, de-pl, cz-de, at-de, de-ch, de-fr, de-lu, be-de, de-nl] footnotes: - "MS = Mitte See" greece: - order: [gr-mk, bg-gr, gr-tr, gr-it] - footnotes: - - "[>] = In Richtung (z. B. Patras [> Ancona] = Patras ist der Grenzpunkt - in Richtung Ancona)" + order: [gr-mk, bg-gr, gr-tr] hungary: order: [ @@ -50,9 +34,9 @@ countries: at-hu-gysev, ] ireland: - order: [ie-gb-rail, ie-gb-sll] + order: [ie-gb-rail] italy: - order: [at-it, it-si, gr-it, fr-it, it-ch] + order: [at-it, it-si, fr-it, it-ch] footnotes: - "[>] = In Richtung (z. B. Domodossola [> Locarno] = Domodossola ist der Grenzpunkt in Richtung Locarno)" @@ -65,7 +49,7 @@ countries: montenegro: order: [me-rs] netherlands: - order: [de-nl, be-nl, nl-gb-stl] + order: [de-nl, be-nl] norway: order: [no-se] poland: @@ -92,7 +76,7 @@ countries: - "[>] = In Richtung (z. B. Locarno [> Domodossola] = Locarno ist der Grenzpunkt in Richtung Domodossola)" united-kingdom: - order: [nl-gb-stl, gb-eurostar, ie-gb-rail, ie-gb-sll, gb-gb-sll] + order: [ie-gb-rail] borders: - id: at-cz @@ -416,21 +400,6 @@ borders: - "Tantow (Gr)" - "Zgorzelec (Gr)" - - id: de-bsb - a: - country: { id: germany } - operators: [{ id: db }] - b: - operators: [{ id: bsb }] - points: - - "Friedrichshafen" - - "Langenargen" - - "Lindau" - - "Konstanz" - - "Radolfzell" - - "Schaffhausen" - - "Überlingen" - - id: de-ch a: country: { id: germany } @@ -470,20 +439,6 @@ borders: points: - "Igel (Gr)" - - id: de-eurostar - a: - country: { id: germany } - operators: [{ id: db }] - b: - operators: [{ id: eurostar }] - points: - - "Aachen" - - "Duisburg" - - "Düsseldorf" - - "Düsseldorf Airport" - - "Essen" - - "Köln" - - id: de-nl a: country: { id: germany } @@ -519,18 +474,6 @@ borders: points: - "Pythio (Πύθιο)" - - id: gr-it - a: - country: { id: greece } - operators: [{ id: attica }] - b: - country: { id: italy } - operators: [{ id: attica }] - points: - - "Patras (Πάτρα) [>Ancona, >Bari]" - - "Ancona [>Igoumenitsa, >Patras]" - - "Bari [>Igoumenitsa, >Patras]" - - id: hu-sk-mav a: country: { id: hungary } @@ -622,17 +565,6 @@ borders: points: - "Dundalk" - - id: ie-gb-sll - a: - country: { id: ireland } - operators: [{ id: sll }] - b: - country: { id: united-kingdom } - operators: [{ id: sll }] - points: - - "Dublin Bay / Holyhead" - - "Rosslare / Fishguard" - - id: it-si a: country: { id: italy } @@ -718,48 +650,6 @@ borders: - "Port Bou (fr)" - "La Tour-de-Carol-Enveitg" - - id: fr-eurostar - a: - country: { id: france } - operators: [{ id: sncf }] - b: - operators: [{ id: eurostar }] - points: - - "Paris" - - "Lille" - - - id: gb-eurostar - a: - country: { id: united-kingdom } - operators: [{ id: gb }] - b: - country: { id: france } - operators: [{ id: eurostar }] - points: - - "London St. Pancras International" - - - id: nl-gb-stl - a: - country: { id: netherlands } - operators: [{ id: stl }] - b: - country: { id: united-kingdom } - operators: [{ id: stl }] - points: - - "Hoek van Holland / Harwich P.Q." - - - id: gb-gb-sll - a: - country: { id: united-kingdom } - operators: [{ id: sll }] - b: - country: { id: united-kingdom } - operators: [{ id: sll }] - points: - - "Cairnryan" - - "Liverpool" - - "Belfast" - - id: lv-ee a: country: { id: latvia } diff --git a/content/country/borderpoints.en.yaml b/content/country/borderpoints.en.yaml index 722685170..087ab33e3 100644 --- a/content/country/borderpoints.en.yaml +++ b/content/country/borderpoints.en.yaml @@ -12,30 +12,14 @@ countries: denmark: order: [dk-se, dk-de] france: - order: [fr-eurostar, be-fr, lu-fr, de-fr, fr-ch, fr-it, es-fr] + order: [be-fr, lu-fr, de-fr, fr-ch, fr-it, es-fr] germany: order: - [ - dk-de, - de-se, - de-pl, - cz-de, - at-de, - de-bsb, - de-ch, - de-fr, - de-lu, - be-de, - de-eurostar, - de-nl, - ] + [dk-de, de-se, de-pl, cz-de, at-de, de-ch, de-fr, de-lu, be-de, de-nl] footnotes: - "MS = Middle of the lake" greece: - order: [gr-mk, bg-gr, gr-tr, gr-it] - footnotes: - - "[>] = In the direction of (e.g. Patras [> Ancona] = Patras is the border - point in the direction of Ancona)" + order: [gr-mk, bg-gr, gr-tr] hungary: order: [ @@ -50,9 +34,9 @@ countries: at-hu-gysev, ] ireland: - order: [ie-gb-rail, ie-gb-sll] + order: [ie-gb-rail] italy: - order: [at-it, it-si, gr-it, fr-it, it-ch] + order: [at-it, it-si, fr-it, it-ch] footnotes: - "[>] = Towards (e.g., Domodossola [> Locarno] = Domodossola is the border point towards Locarno)" @@ -65,7 +49,7 @@ countries: montenegro: order: [me-rs] netherlands: - order: [de-nl, be-nl, nl-gb-stl] + order: [de-nl, be-nl] norway: order: [no-se] poland: @@ -92,7 +76,7 @@ countries: - "[>] = Direction (e.g. Locarno [> Domodossola] = Locarno is the border point towards Domodossola)" united-kingdom: - order: [nl-gb-stl, gb-eurostar, ie-gb-rail, ie-gb-sll, gb-gb-sll] + order: [ie-gb-rail] borders: - id: at-cz @@ -416,21 +400,6 @@ borders: - "Tantow (Gr)" - "Zgorzelec (Gr)" - - id: de-bsb - a: - country: { id: germany } - operators: [{ id: db }] - b: - operators: [{ id: bsb }] - points: - - "Friedrichshafen" - - "Langenargen" - - "Lindau" - - "Konstanz" - - "Radolfzell" - - "Schaffhausen" - - "Überlingen" - - id: de-ch a: country: { id: germany } @@ -470,20 +439,6 @@ borders: points: - "Igel (Gr)" - - id: de-eurostar - a: - country: { id: germany } - operators: [{ id: db }] - b: - operators: [{ id: eurostar }] - points: - - "Aachen" - - "Duisburg" - - "Düsseldorf" - - "Düsseldorf Airport" - - "Essen" - - "Cologne" - - id: de-nl a: country: { id: germany } @@ -519,18 +474,6 @@ borders: points: - "Pythio (Πύθιο)" - - id: gr-it - a: - country: { id: greece } - operators: [{ id: attica }] - b: - country: { id: italy } - operators: [{ id: attica }] - points: - - "Patras (Πάτρα) [>Ancona, >Bari]" - - "Ancona [>Igoumenitsa, >Patras]" - - "Bari [>Igoumenitsa, >Patras]" - - id: hu-sk-mav a: country: { id: hungary } @@ -622,17 +565,6 @@ borders: points: - "Dundalk" - - id: ie-gb-sll - a: - country: { id: ireland } - operators: [{ id: sll }] - b: - country: { id: united-kingdom } - operators: [{ id: sll }] - points: - - "Dublin Bay / Holyhead" - - "Rosslare / Fishguard" - - id: it-si a: country: { id: italy } @@ -718,48 +650,6 @@ borders: - "Port Bou (fr)" - "La Tour-de-Carol-Enveitg" - - id: fr-eurostar - a: - country: { id: france } - operators: [{ id: sncf }] - b: - operators: [{ id: eurostar }] - points: - - "Paris" - - "Lille" - - - id: gb-eurostar - a: - country: { id: united-kingdom } - operators: [{ id: gb }] - b: - country: { id: france } - operators: [{ id: eurostar }] - points: - - "London St. Pancras International" - - - id: nl-gb-stl - a: - country: { id: netherlands } - operators: [{ id: stl }] - b: - country: { id: united-kingdom } - operators: [{ id: stl }] - points: - - "Hoek van Holland / Harwich P.Q." - - - id: gb-gb-sll - a: - country: { id: united-kingdom } - operators: [{ id: sll }] - b: - country: { id: united-kingdom } - operators: [{ id: sll }] - points: - - "Cairnryan" - - "Liverpool" - - "Belfast" - - id: lv-ee a: country: { id: latvia } diff --git a/content/country/borderpoints.fr.yaml b/content/country/borderpoints.fr.yaml index a3e96524e..1c1a6db82 100644 --- a/content/country/borderpoints.fr.yaml +++ b/content/country/borderpoints.fr.yaml @@ -12,30 +12,14 @@ countries: denmark: order: [dk-se, dk-de] france: - order: [fr-eurostar, be-fr, lu-fr, de-fr, fr-ch, fr-it, es-fr] + order: [be-fr, lu-fr, de-fr, fr-ch, fr-it, es-fr] germany: order: - [ - dk-de, - de-se, - de-pl, - cz-de, - at-de, - de-bsb, - de-ch, - de-fr, - de-lu, - be-de, - de-eurostar, - de-nl, - ] + [dk-de, de-se, de-pl, cz-de, at-de, de-ch, de-fr, de-lu, be-de, de-nl] footnotes: - "MS = Milieu du lac" greece: - order: [gr-mk, bg-gr, gr-tr, gr-it] - footnotes: - - "[>] = En direction de (par ex. Patras [> Ancona] = Patras est le point - frontière en direction d’Ancona)" + order: [gr-mk, bg-gr, gr-tr] hungary: order: [ @@ -50,9 +34,9 @@ countries: at-hu-gysev, ] ireland: - order: [ie-gb-rail, ie-gb-sll] + order: [ie-gb-rail] italy: - order: [at-it, it-si, gr-it, fr-it, it-ch] + order: [at-it, it-si, fr-it, it-ch] footnotes: - "[>] = Vers (par exemple, Domodossola [> Locarno] = Domodossola est le point frontière vers Locarno)" @@ -65,7 +49,7 @@ countries: montenegro: order: [me-rs] netherlands: - order: [de-nl, be-nl, nl-gb-stl] + order: [de-nl, be-nl] norway: order: [no-se] poland: @@ -92,7 +76,7 @@ countries: - "[>] = En direction de (par exemple, Locarno [> Domodossola] = Locarno est le point frontière en direction de Domodossola)" united-kingdom: - order: [nl-gb-stl, gb-eurostar, ie-gb-rail, ie-gb-sll, gb-gb-sll] + order: [ie-gb-rail] borders: - id: at-cz @@ -416,21 +400,6 @@ borders: - "Tantow (Gr)" - "Zgorzelec (Gr)" - - id: de-bsb - a: - country: { id: germany } - operators: [{ id: db }] - b: - operators: [{ id: bsb }] - points: - - "Friedrichshafen" - - "Langenargen" - - "Lindau" - - "Constance" - - "Radolfzell" - - "Schaffhausen" - - "Überlingen" - - id: de-ch a: country: { id: germany } @@ -470,20 +439,6 @@ borders: points: - "Igel (Gr)" - - id: de-eurostar - a: - country: { id: germany } - operators: [{ id: db }] - b: - operators: [{ id: eurostar }] - points: - - "Aachen" - - "Duisburg" - - "Düsseldorf" - - "Düsseldorf Airport" - - "Essen" - - "Cologne" - - id: de-nl a: country: { id: germany } @@ -519,18 +474,6 @@ borders: points: - "Pythio (Πύθιο)" - - id: gr-it - a: - country: { id: greece } - operators: [{ id: attica }] - b: - country: { id: italy } - operators: [{ id: attica }] - points: - - "Patras (Πάτρα) [>Ancona, >Bari]" - - "Ancona [>Igoumenitsa, >Patras]" - - "Bari [>Igoumenitsa, >Patras]" - - id: hu-sk-mav a: country: { id: hungary } @@ -622,17 +565,6 @@ borders: points: - "Dundalk" - - id: ie-gb-sll - a: - country: { id: ireland } - operators: [{ id: sll }] - b: - country: { id: united-kingdom } - operators: [{ id: sll }] - points: - - "Dublin Bay / Holyhead" - - "Rosslare / Fishguard" - - id: it-si a: country: { id: italy } @@ -718,48 +650,6 @@ borders: - "Port Bou (fr)" - "La Tour-de-Carol-Enveitg" - - id: fr-eurostar - a: - country: { id: france } - operators: [{ id: sncf }] - b: - operators: [{ id: eurostar }] - points: - - "Paris" - - "Lille" - - - id: gb-eurostar - a: - country: { id: united-kingdom } - operators: [{ id: gb }] - b: - country: { id: france } - operators: [{ id: eurostar }] - points: - - "London St. Pancras International" - - - id: nl-gb-stl - a: - country: { id: netherlands } - operators: [{ id: stl }] - b: - country: { id: united-kingdom } - operators: [{ id: stl }] - points: - - "Hoek van Holland / Harwich P.Q." - - - id: gb-gb-sll - a: - country: { id: united-kingdom } - operators: [{ id: sll }] - b: - country: { id: united-kingdom } - operators: [{ id: sll }] - points: - - "Cairnryan" - - "Liverpool" - - "Belfast" - - id: lv-ee a: country: { id: latvia } From 4e68e94c7c4977e51789972a1b8fdbae9c7f4ddc Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Wed, 7 Oct 2026 22:31:20 +0200 Subject: [PATCH 06/16] refactor: simplify borderPointsRefs to handle a single item --- .../_partials/helper/borderPointsRefs.html | 28 ++++++------------- .../helper/borderPointsSideLabel.html | 17 +++++------ 2 files changed, 16 insertions(+), 29 deletions(-) diff --git a/layouts/_partials/helper/borderPointsRefs.html b/layouts/_partials/helper/borderPointsRefs.html index 7827cdda0..33678bfa2 100644 --- a/layouts/_partials/helper/borderPointsRefs.html +++ b/layouts/_partials/helper/borderPointsRefs.html @@ -1,24 +1,14 @@ {{- $prefix := .prefix -}} {{- $page := .page -}} -{{- $out := slice -}} -{{- range .items -}} - {{- $id := .id -}} - {{- $label := .label -}} - {{- $ref := "" -}} - {{- with $id -}} - {{- with site.GetPage (printf "/%s/%s" $prefix .) -}} - {{- if not $label -}} - {{- $label = .Params.shortName | default .LinkTitle -}} - {{- end -}} - {{- $ref = printf "/%s/%s" $prefix $id -}} - {{- end -}} - {{- end -}} - {{- with $label -}} - {{- if $ref -}} - {{- $out = $out | append (partial "link" (dict "Destination" $ref "Text" . "Page" $page)) -}} - {{- else -}} - {{- $out = $out | append . -}} - {{- end -}} +{{- $id := .id -}} +{{- $out := "" -}} +{{- if $id -}} + {{- with site.GetPage (printf "/%s/%s" $prefix $id) -}} + {{- $ref := printf "/%s/%s" $prefix $id -}} + {{- $text := .Params.shortName | default .LinkTitle -}} + {{- $out = partial "link" (dict "Destination" $ref "Text" $text "Page" $page) -}} {{- end -}} +{{- else -}} + {{- $out = .label -}} {{- end -}} {{- return $out -}} diff --git a/layouts/_partials/helper/borderPointsSideLabel.html b/layouts/_partials/helper/borderPointsSideLabel.html index 7b112624b..bcc5a801f 100644 --- a/layouts/_partials/helper/borderPointsSideLabel.html +++ b/layouts/_partials/helper/borderPointsSideLabel.html @@ -1,15 +1,12 @@ {{- $side := .side -}} {{- $page := .page -}} -{{- $countryItems := slice -}} -{{- with $side.country -}} - {{- $countryItems = slice . -}} -{{- end -}} -{{- $countryLabel := partial "helper/borderPointsRefs" (dict "prefix" "country" "items" $countryItems "page" $page) -}} -{{- $operators := partial "helper/borderPointsRefs" (dict "prefix" "operator" "items" $side.operators "page" $page) -}} -{{- $out := delimit $countryLabel ", " -}} -{{- with $operators -}} - {{- $joined := delimit . ", " -}} - {{- $out = cond (ne $out "") (printf "%s (%s)" $out $joined) $joined -}} +{{- $countryLabel := partial "helper/borderPointsRefs" (dict "prefix" "country" "id" $side.country.id "label" $side.country.label "page" $page) -}} + +{{- $operators := slice -}} +{{- range $side.operators -}} + {{- $operators = $operators | append (partial "helper/borderPointsRefs" (dict "prefix" "operator" "id" .id "label" .label "page" $page)) -}} {{- end -}} + +{{- $out := printf "%s (%s)" $countryLabel (delimit $operators ", ") -}} {{- return $out -}} From f31f5c3a1fefffed874b853dd2cd45d5f710ba6a Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Wed, 7 Oct 2026 22:59:33 +0200 Subject: [PATCH 07/16] refactor: move border points partials into border-points folder --- .../borderPoints.html => border-points/data.html} | 0 .../resolve-ref.html} | 0 .../rows.html} | 4 ++-- layouts/_partials/border-points/side-label.html | 12 ++++++++++++ .../table.html} | 4 ++-- layouts/_partials/helper/borderPointsSideLabel.html | 12 ------------ layouts/_partials/neighboringOperators.html | 2 +- layouts/_shortcodes/border-points.html | 2 +- 8 files changed, 18 insertions(+), 18 deletions(-) rename layouts/_partials/{helper/borderPoints.html => border-points/data.html} (100%) rename layouts/_partials/{helper/borderPointsRefs.html => border-points/resolve-ref.html} (100%) rename layouts/_partials/{helper/borderPointsRows.html => border-points/rows.html} (84%) create mode 100644 layouts/_partials/border-points/side-label.html rename layouts/_partials/{helper/borderPointsTable.html => border-points/table.html} (85%) delete mode 100644 layouts/_partials/helper/borderPointsSideLabel.html diff --git a/layouts/_partials/helper/borderPoints.html b/layouts/_partials/border-points/data.html similarity index 100% rename from layouts/_partials/helper/borderPoints.html rename to layouts/_partials/border-points/data.html diff --git a/layouts/_partials/helper/borderPointsRefs.html b/layouts/_partials/border-points/resolve-ref.html similarity index 100% rename from layouts/_partials/helper/borderPointsRefs.html rename to layouts/_partials/border-points/resolve-ref.html diff --git a/layouts/_partials/helper/borderPointsRows.html b/layouts/_partials/border-points/rows.html similarity index 84% rename from layouts/_partials/helper/borderPointsRows.html rename to layouts/_partials/border-points/rows.html index 4368c871c..9ced6cbda 100644 --- a/layouts/_partials/helper/borderPointsRows.html +++ b/layouts/_partials/border-points/rows.html @@ -1,6 +1,6 @@ {{- $country := .country -}} {{- $page := .page -}} -{{- $data := partialCached "helper/borderPoints" . site.Language.Lang -}} +{{- $data := partialCached "border-points/data" . site.Language.Lang -}} {{- $borders := $data.borders | default slice -}} {{- $ordered := $borders -}} @@ -33,7 +33,7 @@ {{- end -}} {{- with $points -}} {{- $rows = $rows | append (dict - "label" (partial "helper/borderPointsSideLabel" (dict "side" (index $border $other) "page" $page)) + "label" (partial "border-points/side-label" (dict "side" (index $border $other) "page" $page)) "points" .) -}} {{- end -}} diff --git a/layouts/_partials/border-points/side-label.html b/layouts/_partials/border-points/side-label.html new file mode 100644 index 000000000..064d1ca28 --- /dev/null +++ b/layouts/_partials/border-points/side-label.html @@ -0,0 +1,12 @@ +{{- $side := .side -}} +{{- $page := .page -}} + +{{- $countryLabel := partial "border-points/resolve-ref" (dict "prefix" "country" "id" $side.country.id "label" $side.country.label "page" $page) -}} + +{{- $operators := slice -}} +{{- range $side.operators -}} + {{- $operators = $operators | append (partial "border-points/resolve-ref" (dict "prefix" "operator" "id" .id "label" .label "page" $page)) -}} +{{- end -}} + +{{- $out := printf "%s (%s)" $countryLabel (delimit $operators ", ") -}} +{{- return $out -}} diff --git a/layouts/_partials/helper/borderPointsTable.html b/layouts/_partials/border-points/table.html similarity index 85% rename from layouts/_partials/helper/borderPointsTable.html rename to layouts/_partials/border-points/table.html index e191d6e30..92dd8ae3f 100644 --- a/layouts/_partials/helper/borderPointsTable.html +++ b/layouts/_partials/border-points/table.html @@ -1,7 +1,7 @@ {{- $country := .country -}} {{- $page := .page -}} -{{- $data := partialCached "helper/borderPoints" . site.Language.Lang -}} -{{- $rows := partial "helper/borderPointsRows" . -}} +{{- $data := partialCached "border-points/data" . site.Language.Lang -}} +{{- $rows := partial "border-points/rows" . -}} {{- with $rows -}} diff --git a/layouts/_partials/helper/borderPointsSideLabel.html b/layouts/_partials/helper/borderPointsSideLabel.html deleted file mode 100644 index bcc5a801f..000000000 --- a/layouts/_partials/helper/borderPointsSideLabel.html +++ /dev/null @@ -1,12 +0,0 @@ -{{- $side := .side -}} -{{- $page := .page -}} - -{{- $countryLabel := partial "helper/borderPointsRefs" (dict "prefix" "country" "id" $side.country.id "label" $side.country.label "page" $page) -}} - -{{- $operators := slice -}} -{{- range $side.operators -}} - {{- $operators = $operators | append (partial "helper/borderPointsRefs" (dict "prefix" "operator" "id" .id "label" .label "page" $page)) -}} -{{- end -}} - -{{- $out := printf "%s (%s)" $countryLabel (delimit $operators ", ") -}} -{{- return $out -}} diff --git a/layouts/_partials/neighboringOperators.html b/layouts/_partials/neighboringOperators.html index 1d2521138..9352bba08 100644 --- a/layouts/_partials/neighboringOperators.html +++ b/layouts/_partials/neighboringOperators.html @@ -1,5 +1,5 @@ {{- $operator := .page.File.ContentBaseName -}} -{{- $data := partialCached "helper/borderPoints" . site.Language.Lang -}} +{{- $data := partialCached "border-points/data" . site.Language.Lang -}} {{- $ids := slice -}} {{- range $data.borders -}} diff --git a/layouts/_shortcodes/border-points.html b/layouts/_shortcodes/border-points.html index bb1b654b2..a188880a9 100644 --- a/layouts/_shortcodes/border-points.html +++ b/layouts/_shortcodes/border-points.html @@ -1,6 +1,6 @@ {{- partial "expander" (dict "Title" (T "borderPoints.title") "Variant" "border" - "Content" (partial "helper/borderPointsTable" (dict "country" .Page.Params.country "page" .Page) | safeHTML) + "Content" (partial "border-points/table" (dict "country" .Page.Params.country "page" .Page) | safeHTML) ) -}} From 4f428d157d1cdac90323da9938e3c8b4c8e14f8e Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Thu, 8 Oct 2026 19:11:36 +0200 Subject: [PATCH 08/16] feat: restore BSB, Attica, Eurostar and Stena Line border points --- content/country/borderpoints.de.yaml | 127 +++++++++++++++++- content/country/borderpoints.en.yaml | 127 +++++++++++++++++- content/country/borderpoints.fr.yaml | 127 +++++++++++++++++- .../_partials/border-points/side-label.html | 8 +- 4 files changed, 366 insertions(+), 23 deletions(-) diff --git a/content/country/borderpoints.de.yaml b/content/country/borderpoints.de.yaml index fbc1a3376..8d9f3599d 100644 --- a/content/country/borderpoints.de.yaml +++ b/content/country/borderpoints.de.yaml @@ -12,14 +12,30 @@ countries: denmark: order: [dk-se, dk-de] france: - order: [be-fr, lu-fr, de-fr, fr-ch, fr-it, es-fr] + order: [fr-eurostar, be-fr, lu-fr, de-fr, fr-ch, fr-it, es-fr] germany: order: - [dk-de, de-se, de-pl, cz-de, at-de, de-ch, de-fr, de-lu, be-de, de-nl] + [ + dk-de, + de-se, + de-pl, + cz-de, + at-de, + de-bsb, + de-ch, + de-fr, + de-lu, + be-de, + de-eurostar, + de-nl, + ] footnotes: - "MS = Mitte See" greece: - order: [gr-mk, bg-gr, gr-tr] + order: [gr-mk, bg-gr, gr-tr, gr-it] + footnotes: + - "[>] = In Richtung (z. B. Patras [> Ancona] = Patras ist der Grenzpunkt + in Richtung Ancona)" hungary: order: [ @@ -34,9 +50,9 @@ countries: at-hu-gysev, ] ireland: - order: [ie-gb-rail] + order: [ie-gb-rail, ie-gb-sll] italy: - order: [at-it, it-si, fr-it, it-ch] + order: [at-it, it-si, gr-it, fr-it, it-ch] footnotes: - "[>] = In Richtung (z. B. Domodossola [> Locarno] = Domodossola ist der Grenzpunkt in Richtung Locarno)" @@ -49,7 +65,7 @@ countries: montenegro: order: [me-rs] netherlands: - order: [de-nl, be-nl] + order: [de-nl, be-nl, nl-gb-stl] norway: order: [no-se] poland: @@ -76,7 +92,7 @@ countries: - "[>] = In Richtung (z. B. Locarno [> Domodossola] = Locarno ist der Grenzpunkt in Richtung Domodossola)" united-kingdom: - order: [ie-gb-rail] + order: [nl-gb-stl, gb-eurostar, ie-gb-rail, ie-gb-sll, gb-gb-sll] borders: - id: at-cz @@ -400,6 +416,22 @@ borders: - "Tantow (Gr)" - "Zgorzelec (Gr)" + - id: de-bsb + a: + country: { id: germany } + operators: [{ id: db }] + b: + country: null + operators: [{ id: bsb }] + points: + - "Friedrichshafen" + - "Langenargen" + - "Lindau" + - "Konstanz" + - "Radolfzell" + - "Schaffhausen" + - "Überlingen" + - id: de-ch a: country: { id: germany } @@ -454,6 +486,21 @@ borders: - "Venlo (Gr)" - "Weener (Gr)" + - id: de-eurostar + a: + country: { id: germany } + operators: [{ id: db }] + b: + country: null + operators: [{ id: eurostar }] + points: + - "Aachen" + - "Duisburg" + - "Düsseldorf" + - "Düsseldorf Airport" + - "Essen" + - "Köln" + - id: gr-mk a: country: { id: greece } @@ -474,6 +521,18 @@ borders: points: - "Pythio (Πύθιο)" + - id: gr-it + a: + country: { id: greece } + operators: [{ id: attica }] + b: + country: { id: italy } + operators: [{ id: attica }] + points: + - "Patras (Πάτρα) [>Ancona, >Bari]" + - "Ancona [>Igoumenitsa, >Patras]" + - "Bari [>Igoumenitsa, >Patras]" + - id: hu-sk-mav a: country: { id: hungary } @@ -565,6 +624,17 @@ borders: points: - "Dundalk" + - id: ie-gb-sll + a: + country: { id: ireland } + operators: [{ id: sll }] + b: + country: { id: united-kingdom } + operators: [{ id: sll }] + points: + - "Dublin Bay / Holyhead" + - "Rosslare / Fishguard" + - id: it-si a: country: { id: italy } @@ -650,6 +720,49 @@ borders: - "Port Bou (fr)" - "La Tour-de-Carol-Enveitg" + - id: fr-eurostar + a: + country: { id: france } + operators: [{ id: sncf }] + b: + country: null + operators: [{ id: eurostar }] + points: + - "Paris" + - "Lille" + + - id: gb-eurostar + a: + country: { id: united-kingdom } + operators: [{ id: gb }] + b: + country: { id: france } + operators: [{ id: eurostar }] + points: + - "London St. Pancras International" + + - id: nl-gb-stl + a: + country: { id: netherlands } + operators: [{ id: stl }] + b: + country: { id: united-kingdom } + operators: [{ id: stl }] + points: + - "Hoek van Holland / Harwich P.Q." + + - id: gb-gb-sll + a: + country: { id: united-kingdom } + operators: [{ id: sll }] + b: + country: { id: united-kingdom } + operators: [{ id: sll }] + points: + - "Cairnryan" + - "Liverpool" + - "Belfast" + - id: lv-ee a: country: { id: latvia } diff --git a/content/country/borderpoints.en.yaml b/content/country/borderpoints.en.yaml index 087ab33e3..6a3fe0f0c 100644 --- a/content/country/borderpoints.en.yaml +++ b/content/country/borderpoints.en.yaml @@ -12,14 +12,30 @@ countries: denmark: order: [dk-se, dk-de] france: - order: [be-fr, lu-fr, de-fr, fr-ch, fr-it, es-fr] + order: [fr-eurostar, be-fr, lu-fr, de-fr, fr-ch, fr-it, es-fr] germany: order: - [dk-de, de-se, de-pl, cz-de, at-de, de-ch, de-fr, de-lu, be-de, de-nl] + [ + dk-de, + de-se, + de-pl, + cz-de, + at-de, + de-bsb, + de-ch, + de-fr, + de-lu, + be-de, + de-eurostar, + de-nl, + ] footnotes: - "MS = Middle of the lake" greece: - order: [gr-mk, bg-gr, gr-tr] + order: [gr-mk, bg-gr, gr-tr, gr-it] + footnotes: + - "[>] = In the direction of (e.g. Patras [> Ancona] = Patras is the border + point in the direction of Ancona)" hungary: order: [ @@ -34,9 +50,9 @@ countries: at-hu-gysev, ] ireland: - order: [ie-gb-rail] + order: [ie-gb-rail, ie-gb-sll] italy: - order: [at-it, it-si, fr-it, it-ch] + order: [at-it, it-si, gr-it, fr-it, it-ch] footnotes: - "[>] = Towards (e.g., Domodossola [> Locarno] = Domodossola is the border point towards Locarno)" @@ -49,7 +65,7 @@ countries: montenegro: order: [me-rs] netherlands: - order: [de-nl, be-nl] + order: [de-nl, be-nl, nl-gb-stl] norway: order: [no-se] poland: @@ -76,7 +92,7 @@ countries: - "[>] = Direction (e.g. Locarno [> Domodossola] = Locarno is the border point towards Domodossola)" united-kingdom: - order: [ie-gb-rail] + order: [nl-gb-stl, gb-eurostar, ie-gb-rail, ie-gb-sll, gb-gb-sll] borders: - id: at-cz @@ -400,6 +416,22 @@ borders: - "Tantow (Gr)" - "Zgorzelec (Gr)" + - id: de-bsb + a: + country: { id: germany } + operators: [{ id: db }] + b: + country: null + operators: [{ id: bsb }] + points: + - "Friedrichshafen" + - "Langenargen" + - "Lindau" + - "Konstanz" + - "Radolfzell" + - "Schaffhausen" + - "Überlingen" + - id: de-ch a: country: { id: germany } @@ -454,6 +486,21 @@ borders: - "Venlo (Gr)" - "Weener (Gr)" + - id: de-eurostar + a: + country: { id: germany } + operators: [{ id: db }] + b: + country: null + operators: [{ id: eurostar }] + points: + - "Aachen" + - "Duisburg" + - "Düsseldorf" + - "Düsseldorf Airport" + - "Essen" + - "Cologne" + - id: gr-mk a: country: { id: greece } @@ -474,6 +521,18 @@ borders: points: - "Pythio (Πύθιο)" + - id: gr-it + a: + country: { id: greece } + operators: [{ id: attica }] + b: + country: { id: italy } + operators: [{ id: attica }] + points: + - "Patras (Πάτρα) [>Ancona, >Bari]" + - "Ancona [>Igoumenitsa, >Patras]" + - "Bari [>Igoumenitsa, >Patras]" + - id: hu-sk-mav a: country: { id: hungary } @@ -565,6 +624,17 @@ borders: points: - "Dundalk" + - id: ie-gb-sll + a: + country: { id: ireland } + operators: [{ id: sll }] + b: + country: { id: united-kingdom } + operators: [{ id: sll }] + points: + - "Dublin Bay / Holyhead" + - "Rosslare / Fishguard" + - id: it-si a: country: { id: italy } @@ -650,6 +720,49 @@ borders: - "Port Bou (fr)" - "La Tour-de-Carol-Enveitg" + - id: fr-eurostar + a: + country: { id: france } + operators: [{ id: sncf }] + b: + country: null + operators: [{ id: eurostar }] + points: + - "Paris" + - "Lille" + + - id: gb-eurostar + a: + country: { id: united-kingdom } + operators: [{ id: gb }] + b: + country: { id: france } + operators: [{ id: eurostar }] + points: + - "London St. Pancras International" + + - id: nl-gb-stl + a: + country: { id: netherlands } + operators: [{ id: stl }] + b: + country: { id: united-kingdom } + operators: [{ id: stl }] + points: + - "Hoek van Holland / Harwich P.Q." + + - id: gb-gb-sll + a: + country: { id: united-kingdom } + operators: [{ id: sll }] + b: + country: { id: united-kingdom } + operators: [{ id: sll }] + points: + - "Cairnryan" + - "Liverpool" + - "Belfast" + - id: lv-ee a: country: { id: latvia } diff --git a/content/country/borderpoints.fr.yaml b/content/country/borderpoints.fr.yaml index 1c1a6db82..bb273c76e 100644 --- a/content/country/borderpoints.fr.yaml +++ b/content/country/borderpoints.fr.yaml @@ -12,14 +12,30 @@ countries: denmark: order: [dk-se, dk-de] france: - order: [be-fr, lu-fr, de-fr, fr-ch, fr-it, es-fr] + order: [fr-eurostar, be-fr, lu-fr, de-fr, fr-ch, fr-it, es-fr] germany: order: - [dk-de, de-se, de-pl, cz-de, at-de, de-ch, de-fr, de-lu, be-de, de-nl] + [ + dk-de, + de-se, + de-pl, + cz-de, + at-de, + de-bsb, + de-ch, + de-fr, + de-lu, + be-de, + de-eurostar, + de-nl, + ] footnotes: - "MS = Milieu du lac" greece: - order: [gr-mk, bg-gr, gr-tr] + order: [gr-mk, bg-gr, gr-tr, gr-it] + footnotes: + - "[>] = En direction de (par ex. Patras [> Ancona] = Patras est le point + frontière en direction d’Ancona)" hungary: order: [ @@ -34,9 +50,9 @@ countries: at-hu-gysev, ] ireland: - order: [ie-gb-rail] + order: [ie-gb-rail, ie-gb-sll] italy: - order: [at-it, it-si, fr-it, it-ch] + order: [at-it, it-si, gr-it, fr-it, it-ch] footnotes: - "[>] = Vers (par exemple, Domodossola [> Locarno] = Domodossola est le point frontière vers Locarno)" @@ -49,7 +65,7 @@ countries: montenegro: order: [me-rs] netherlands: - order: [de-nl, be-nl] + order: [de-nl, be-nl, nl-gb-stl] norway: order: [no-se] poland: @@ -76,7 +92,7 @@ countries: - "[>] = En direction de (par exemple, Locarno [> Domodossola] = Locarno est le point frontière en direction de Domodossola)" united-kingdom: - order: [ie-gb-rail] + order: [nl-gb-stl, gb-eurostar, ie-gb-rail, ie-gb-sll, gb-gb-sll] borders: - id: at-cz @@ -400,6 +416,22 @@ borders: - "Tantow (Gr)" - "Zgorzelec (Gr)" + - id: de-bsb + a: + country: { id: germany } + operators: [{ id: db }] + b: + country: null + operators: [{ id: bsb }] + points: + - "Friedrichshafen" + - "Langenargen" + - "Lindau" + - "Konstanz" + - "Radolfzell" + - "Schaffhausen" + - "Überlingen" + - id: de-ch a: country: { id: germany } @@ -454,6 +486,21 @@ borders: - "Venlo (Gr)" - "Weener (Gr)" + - id: de-eurostar + a: + country: { id: germany } + operators: [{ id: db }] + b: + country: null + operators: [{ id: eurostar }] + points: + - "Aachen" + - "Duisburg" + - "Düsseldorf" + - "Düsseldorf Airport" + - "Essen" + - "Cologne" + - id: gr-mk a: country: { id: greece } @@ -474,6 +521,18 @@ borders: points: - "Pythio (Πύθιο)" + - id: gr-it + a: + country: { id: greece } + operators: [{ id: attica }] + b: + country: { id: italy } + operators: [{ id: attica }] + points: + - "Patras (Πάτρα) [>Ancona, >Bari]" + - "Ancona [>Igoumenitsa, >Patras]" + - "Bari [>Igoumenitsa, >Patras]" + - id: hu-sk-mav a: country: { id: hungary } @@ -565,6 +624,17 @@ borders: points: - "Dundalk" + - id: ie-gb-sll + a: + country: { id: ireland } + operators: [{ id: sll }] + b: + country: { id: united-kingdom } + operators: [{ id: sll }] + points: + - "Dublin Bay / Holyhead" + - "Rosslare / Fishguard" + - id: it-si a: country: { id: italy } @@ -650,6 +720,49 @@ borders: - "Port Bou (fr)" - "La Tour-de-Carol-Enveitg" + - id: fr-eurostar + a: + country: { id: france } + operators: [{ id: sncf }] + b: + country: null + operators: [{ id: eurostar }] + points: + - "Paris" + - "Lille" + + - id: gb-eurostar + a: + country: { id: united-kingdom } + operators: [{ id: gb }] + b: + country: { id: france } + operators: [{ id: eurostar }] + points: + - "London St. Pancras International" + + - id: nl-gb-stl + a: + country: { id: netherlands } + operators: [{ id: stl }] + b: + country: { id: united-kingdom } + operators: [{ id: stl }] + points: + - "Hoek van Holland / Harwich P.Q." + + - id: gb-gb-sll + a: + country: { id: united-kingdom } + operators: [{ id: sll }] + b: + country: { id: united-kingdom } + operators: [{ id: sll }] + points: + - "Cairnryan" + - "Liverpool" + - "Belfast" + - id: lv-ee a: country: { id: latvia } diff --git a/layouts/_partials/border-points/side-label.html b/layouts/_partials/border-points/side-label.html index 064d1ca28..bab0f9fdb 100644 --- a/layouts/_partials/border-points/side-label.html +++ b/layouts/_partials/border-points/side-label.html @@ -1,12 +1,16 @@ {{- $side := .side -}} {{- $page := .page -}} -{{- $countryLabel := partial "border-points/resolve-ref" (dict "prefix" "country" "id" $side.country.id "label" $side.country.label "page" $page) -}} +{{- $countryLabel := "" -}} +{{- with $side.country -}} + {{- $countryLabel = partial "border-points/resolve-ref" (dict "prefix" "country" "id" .id "label" .label "page" $page) -}} +{{- end -}} {{- $operators := slice -}} {{- range $side.operators -}} {{- $operators = $operators | append (partial "border-points/resolve-ref" (dict "prefix" "operator" "id" .id "label" .label "page" $page)) -}} {{- end -}} +{{- $operatorLabel := delimit $operators ", " -}} -{{- $out := printf "%s (%s)" $countryLabel (delimit $operators ", ") -}} +{{- $out := cond (ne $countryLabel "") (printf "%s (%s)" $countryLabel $operatorLabel) $operatorLabel -}} {{- return $out -}} From 20fe84ae57a36c04443c055f0df0c6edc2bec53c Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Thu, 8 Oct 2026 19:30:41 +0200 Subject: [PATCH 09/16] feat: shorten operator shortName for HT, LTG and ZSSK --- content/operator/ht/index.de.md | 2 +- content/operator/ht/index.en.md | 2 +- content/operator/ht/index.fr.md | 2 +- content/operator/ltg/index.de.md | 2 +- content/operator/ltg/index.en.md | 2 +- content/operator/ltg/index.fr.md | 2 +- content/operator/zssk/index.de.md | 2 +- content/operator/zssk/index.en.md | 2 +- content/operator/zssk/index.fr.md | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/content/operator/ht/index.de.md b/content/operator/ht/index.de.md index 27bdf1406..8b9362b7a 100644 --- a/content/operator/ht/index.de.md +++ b/content/operator/ht/index.de.md @@ -1,6 +1,6 @@ --- title: Hellenic Train -shortName: Hellenic Train +shortName: HT country: - greece operator: ht diff --git a/content/operator/ht/index.en.md b/content/operator/ht/index.en.md index 7dbcd4dae..39620d6b9 100644 --- a/content/operator/ht/index.en.md +++ b/content/operator/ht/index.en.md @@ -1,6 +1,6 @@ --- title: Hellenic Train -shortName: Hellenic Train +shortName: HT country: - greece operator: ht diff --git a/content/operator/ht/index.fr.md b/content/operator/ht/index.fr.md index 230e788bf..972845823 100644 --- a/content/operator/ht/index.fr.md +++ b/content/operator/ht/index.fr.md @@ -1,6 +1,6 @@ --- title: Hellenic Train -shortName: Hellenic Train +shortName: HT country: - greece operator: ht diff --git a/content/operator/ltg/index.de.md b/content/operator/ltg/index.de.md index 7e36bdc9b..a926e583c 100644 --- a/content/operator/ltg/index.de.md +++ b/content/operator/ltg/index.de.md @@ -1,6 +1,6 @@ --- title: LTG-Link -shortName: LTG-Link +shortName: LTG country: - lithuania - latvia diff --git a/content/operator/ltg/index.en.md b/content/operator/ltg/index.en.md index 486d356a2..7f292ab0d 100644 --- a/content/operator/ltg/index.en.md +++ b/content/operator/ltg/index.en.md @@ -1,6 +1,6 @@ --- title: LTG-Link -shortName: LTG-Link +shortName: LTG country: - lithuania - latvia diff --git a/content/operator/ltg/index.fr.md b/content/operator/ltg/index.fr.md index db3e1fee7..648d29359 100644 --- a/content/operator/ltg/index.fr.md +++ b/content/operator/ltg/index.fr.md @@ -1,6 +1,6 @@ --- title: LTG-Link -shortName: LTG-Link +shortName: LTG country: - lithuania - latvia diff --git a/content/operator/zssk/index.de.md b/content/operator/zssk/index.de.md index 742070e85..5ddf7fed7 100644 --- a/content/operator/zssk/index.de.md +++ b/content/operator/zssk/index.de.md @@ -1,6 +1,6 @@ --- title: ZSSK / ŽSR -shortName: ZSSK / ŽSR +shortName: ZSSK country: - slovakia operator: zssk diff --git a/content/operator/zssk/index.en.md b/content/operator/zssk/index.en.md index 81ee770f3..d346a9d8a 100644 --- a/content/operator/zssk/index.en.md +++ b/content/operator/zssk/index.en.md @@ -1,6 +1,6 @@ --- title: ZSSK / ZSR -shortName: ZSSK / ŽSR +shortName: ZSSK country: - slovakia operator: zssk diff --git a/content/operator/zssk/index.fr.md b/content/operator/zssk/index.fr.md index 21bfbdb2b..7aa454813 100644 --- a/content/operator/zssk/index.fr.md +++ b/content/operator/zssk/index.fr.md @@ -1,6 +1,6 @@ --- title: ZSSK / ZSR -shortName: ZSSK / ŽSR +shortName: ZSSK country: - slovakia operator: zssk From fd31a7dbe67040ce727ee3e24d6fd604ca03a489 Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Thu, 8 Oct 2026 19:30:58 +0200 Subject: [PATCH 10/16] fix: reorder de-eurostar border entry above de-nl --- content/country/borderpoints.de.yaml | 30 ++++++++++++++-------------- content/country/borderpoints.en.yaml | 30 ++++++++++++++-------------- content/country/borderpoints.fr.yaml | 30 ++++++++++++++-------------- 3 files changed, 45 insertions(+), 45 deletions(-) diff --git a/content/country/borderpoints.de.yaml b/content/country/borderpoints.de.yaml index 8d9f3599d..523e99f0c 100644 --- a/content/country/borderpoints.de.yaml +++ b/content/country/borderpoints.de.yaml @@ -471,21 +471,6 @@ borders: points: - "Igel (Gr)" - - id: de-nl - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { id: netherlands } - operators: [{ id: ns }] - points: - - "Bad Bentheim (Gr)" - - "Emmerich (Gr)" - - "Gronau (Westf) (Gr)" - - "Herzogenrath (Gr)" - - "Venlo (Gr)" - - "Weener (Gr)" - - id: de-eurostar a: country: { id: germany } @@ -501,6 +486,21 @@ borders: - "Essen" - "Köln" + - id: de-nl + a: + country: { id: germany } + operators: [{ id: db }] + b: + country: { id: netherlands } + operators: [{ id: ns }] + points: + - "Bad Bentheim (Gr)" + - "Emmerich (Gr)" + - "Gronau (Westf) (Gr)" + - "Herzogenrath (Gr)" + - "Venlo (Gr)" + - "Weener (Gr)" + - id: gr-mk a: country: { id: greece } diff --git a/content/country/borderpoints.en.yaml b/content/country/borderpoints.en.yaml index 6a3fe0f0c..78459d6d1 100644 --- a/content/country/borderpoints.en.yaml +++ b/content/country/borderpoints.en.yaml @@ -471,21 +471,6 @@ borders: points: - "Igel (Gr)" - - id: de-nl - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { id: netherlands } - operators: [{ id: ns }] - points: - - "Bad Bentheim (Gr)" - - "Emmerich (Gr)" - - "Gronau (Westf) (Gr)" - - "Herzogenrath (Gr)" - - "Venlo (Gr)" - - "Weener (Gr)" - - id: de-eurostar a: country: { id: germany } @@ -501,6 +486,21 @@ borders: - "Essen" - "Cologne" + - id: de-nl + a: + country: { id: germany } + operators: [{ id: db }] + b: + country: { id: netherlands } + operators: [{ id: ns }] + points: + - "Bad Bentheim (Gr)" + - "Emmerich (Gr)" + - "Gronau (Westf) (Gr)" + - "Herzogenrath (Gr)" + - "Venlo (Gr)" + - "Weener (Gr)" + - id: gr-mk a: country: { id: greece } diff --git a/content/country/borderpoints.fr.yaml b/content/country/borderpoints.fr.yaml index bb273c76e..77768c920 100644 --- a/content/country/borderpoints.fr.yaml +++ b/content/country/borderpoints.fr.yaml @@ -471,21 +471,6 @@ borders: points: - "Igel (Gr)" - - id: de-nl - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { id: netherlands } - operators: [{ id: ns }] - points: - - "Bad Bentheim (Gr)" - - "Emmerich (Gr)" - - "Gronau (Westf) (Gr)" - - "Herzogenrath (Gr)" - - "Venlo (Gr)" - - "Weener (Gr)" - - id: de-eurostar a: country: { id: germany } @@ -501,6 +486,21 @@ borders: - "Essen" - "Cologne" + - id: de-nl + a: + country: { id: germany } + operators: [{ id: db }] + b: + country: { id: netherlands } + operators: [{ id: ns }] + points: + - "Bad Bentheim (Gr)" + - "Emmerich (Gr)" + - "Gronau (Westf) (Gr)" + - "Herzogenrath (Gr)" + - "Venlo (Gr)" + - "Weener (Gr)" + - id: gr-mk a: country: { id: greece } From af674a9cf57cd5affc1d3109d3450e4560c6be43 Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Thu, 8 Oct 2026 21:51:11 +0200 Subject: [PATCH 11/16] feat: convert borderpoints CMS config to i18n singleton --- layouts/admin/section.cmsconfig.yml | 146 ++++++++++++++-------------- 1 file changed, 72 insertions(+), 74 deletions(-) diff --git a/layouts/admin/section.cmsconfig.yml b/layouts/admin/section.cmsconfig.yml index a116b5f5c..4542085e3 100644 --- a/layouts/admin/section.cmsconfig.yml +++ b/layouts/admin/section.cmsconfig.yml @@ -247,80 +247,6 @@ collections: - "columns" - "footnote" - - name: "borderpoints" - label: "Border Points" - files: - - name: "borderpoints" - label: "Border Points" - file: "content/country/borderpoints.yaml" - i18n: true - fields: - - label: "Countries" - name: "countries" - widget: "list" - i18n: true - collapsed: true - summary: "{{"{{"}}fields.id}}" - hint: "Row order and footnotes of the border point table per country." - fields: - - label: "Country" - name: "id" - widget: "relation" - collection: "country" - search_fields: ["title"] - value_field: "country" - display_fields: ["title"] - i18n: duplicate - - label: "Row Order" - name: "order" - widget: "list" - i18n: duplicate - hint: "Border IDs in clockwise order, starting in the north of the country." - - label: "Footnotes" - name: "footnotes" - widget: "list" - required: false - i18n: true - - label: "Borders" - name: "borders" - widget: "list" - i18n: true - collapsed: true - summary: "{{"{{"}}fields.id}}" - hint: "Each border is defined once; both country tables are generated from it." - fields: - - label: "ID" - name: "id" - widget: "string" - i18n: duplicate - hint: 'Unique identifier, e.g. "at-cz". Referenced in the row order above.' - - label: "Sorting" - name: "sort" - widget: "boolean" - default: false - required: false - i18n: duplicate - hint: "Sort the border points of this border alphabetically." - - label: "Side A" - name: "a" - widget: "object" - i18n: true - collapsed: true - summary: "Countries & Operators" - fields: *border_side - - label: "Side B" - name: "b" - widget: "object" - i18n: true - collapsed: true - summary: "Countries & Operators" - fields: *border_side - - label: "Border Points" - name: "points" - widget: "list" - i18n: true - hint: "One name per crossing, shown in both country tables." - - name: "operator" label: "Operators" label_singular: "Operator" @@ -904,3 +830,75 @@ collections: - "wip" - "columns" - "footnote" + +singletons: + - name: "borderpoints" + label: "Border Points" + file: "content/country/borderpoints.{{"{{"}}locale}}.yaml" + i18n: true + fields: + - label: "Countries" + name: "countries" + widget: "list" + i18n: true + collapsed: true + summary: "{{"{{"}}fields.id}}" + hint: "Row order and footnotes of the border point table per country." + fields: + - label: "Country" + name: "id" + widget: "relation" + collection: "country" + search_fields: ["title"] + value_field: "country" + display_fields: ["title"] + i18n: duplicate + - label: "Row Order" + name: "order" + widget: "list" + i18n: duplicate + hint: "Border IDs in clockwise order, starting in the north of the country." + - label: "Footnotes" + name: "footnotes" + widget: "list" + required: false + i18n: true + - label: "Borders" + name: "borders" + widget: "list" + i18n: true + collapsed: true + summary: "{{"{{"}}fields.id}}" + hint: "Each border is defined once; both country tables are generated from it." + fields: + - label: "ID" + name: "id" + widget: "string" + i18n: duplicate + hint: 'Unique identifier, e.g. "at-cz". Referenced in the row order above.' + - label: "Sorting" + name: "sort" + widget: "boolean" + default: false + required: false + i18n: duplicate + hint: "Sort the border points of this border alphabetically." + - label: "Side A" + name: "a" + widget: "object" + i18n: true + collapsed: true + summary: "Countries & Operators" + fields: *border_side + - label: "Side B" + name: "b" + widget: "object" + i18n: true + collapsed: true + summary: "Countries & Operators" + fields: *border_side + - label: "Border Points" + name: "points" + widget: "list" + i18n: true + hint: "One name per crossing, shown in both country tables." From 9aaf54f224a4a1e208904ec464a7ea536fa22c2c Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Thu, 8 Oct 2026 22:23:54 +0200 Subject: [PATCH 12/16] feat: move border point row order/footnotes into country frontmatter --- archetypes/country/index.de.md | 6 +- archetypes/country/index.en.md | 6 +- archetypes/country/index.fr.md | 6 +- content/country/austria/index.de.md | 13 +- content/country/austria/index.en.md | 13 +- content/country/austria/index.fr.md | 13 +- content/country/belgium/index.de.md | 5 + content/country/belgium/index.en.md | 5 + content/country/belgium/index.fr.md | 5 + content/country/borderpoints.de.yaml | 2086 +++++++++-------- content/country/borderpoints.en.yaml | 2086 +++++++++-------- content/country/borderpoints.fr.yaml | 2086 +++++++++-------- .../bosnia-and-herzegovina/index.de.md | 8 +- .../bosnia-and-herzegovina/index.en.md | 8 +- .../bosnia-and-herzegovina/index.fr.md | 8 +- content/country/bulgaria/index.de.md | 5 + content/country/bulgaria/index.en.md | 5 + content/country/bulgaria/index.fr.md | 5 + content/country/czechia/index.de.md | 5 + content/country/czechia/index.en.md | 5 + content/country/czechia/index.fr.md | 5 + content/country/denmark/index.de.md | 3 + content/country/denmark/index.en.md | 3 + content/country/denmark/index.fr.md | 3 + content/country/france/index.de.md | 11 +- content/country/france/index.en.md | 11 +- content/country/france/index.fr.md | 11 +- content/country/germany/index.de.md | 15 + content/country/germany/index.en.md | 15 + content/country/germany/index.fr.md | 15 + content/country/greece/index.de.md | 8 + content/country/greece/index.en.md | 8 + content/country/greece/index.fr.md | 8 + content/country/hungary/index.de.md | 10 + content/country/hungary/index.en.md | 10 + content/country/hungary/index.fr.md | 10 + 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 | 12 +- content/country/italy/index.en.md | 12 +- content/country/italy/index.fr.md | 12 +- content/country/latvia/index.de.md | 5 + content/country/latvia/index.en.md | 5 + content/country/latvia/index.fr.md | 5 + content/country/lithuania/index.de.md | 5 + content/country/lithuania/index.en.md | 5 + content/country/lithuania/index.fr.md | 5 + content/country/luxembourg/index.de.md | 5 + content/country/luxembourg/index.en.md | 5 + content/country/luxembourg/index.fr.md | 5 + content/country/montenegro/index.de.md | 3 + content/country/montenegro/index.en.md | 3 + content/country/montenegro/index.fr.md | 3 + content/country/netherlands/index.de.md | 4 + content/country/netherlands/index.en.md | 4 + content/country/netherlands/index.fr.md | 4 + content/country/norway/index.de.md | 2 + content/country/norway/index.en.md | 2 + content/country/norway/index.fr.md | 2 + content/country/poland/index.de.md | 8 + content/country/poland/index.en.md | 8 + content/country/poland/index.fr.md | 8 + content/country/portugal/index.de.md | 5 + content/country/portugal/index.en.md | 5 + content/country/portugal/index.fr.md | 5 + content/country/romania/index.de.md | 6 + content/country/romania/index.en.md | 6 + content/country/romania/index.fr.md | 6 + content/country/serbia/index.de.md | 8 + content/country/serbia/index.en.md | 8 + content/country/serbia/index.fr.md | 8 + content/country/slovakia/index.de.md | 4 + content/country/slovakia/index.en.md | 4 + content/country/slovakia/index.fr.md | 4 + content/country/slovenia/index.de.md | 5 + content/country/slovenia/index.en.md | 5 + content/country/slovenia/index.fr.md | 5 + content/country/spain/index.de.md | 3 + content/country/spain/index.en.md | 3 + content/country/spain/index.fr.md | 3 + content/country/switzerland/index.de.md | 8 + content/country/switzerland/index.en.md | 8 + content/country/switzerland/index.fr.md | 8 + content/country/united-kingdom/index.de.md | 10 +- content/country/united-kingdom/index.en.md | 9 +- content/country/united-kingdom/index.fr.md | 9 +- layouts/_partials/border-points/rows.html | 17 +- layouts/_partials/border-points/table.html | 17 +- layouts/_partials/neighboringOperators.html | 4 +- layouts/admin/section.cmsconfig.yml | 58 +- 91 files changed, 3883 insertions(+), 3024 deletions(-) diff --git a/archetypes/country/index.de.md b/archetypes/country/index.de.md index 995cac61f..466a32bcc 100644 --- a/archetypes/country/index.de.md +++ b/archetypes/country/index.de.md @@ -4,6 +4,10 @@ country: "{{ .File.ContentBaseName }}" params: operators_without_fip: - # Liste Betreiber, die kein FIP akzeptieren + border_points: + - # Grenzpunkt-IDs im Uhrzeigersinn, startend im Norden des Landes, wie in `content/country/borderpoints.de.yaml` definiert + border_points_footnotes: + - # Optionale Fußnoten unter der Grenzpunkt-Tabelle --- @@ -38,7 +42,7 @@ params: ## Anreise und Grenzpunkte {{< border-points >}} diff --git a/archetypes/country/index.en.md b/archetypes/country/index.en.md index 30007408c..cc9fb8e91 100644 --- a/archetypes/country/index.en.md +++ b/archetypes/country/index.en.md @@ -4,6 +4,10 @@ country: "{{ .File.ContentBaseName }}" params: operators_without_fip: - # List operators without FIP here + border_points: + - # List border IDs in clockwise order, starting in the north of the country, as defined in `content/country/borderpoints.en.yaml` + border_points_footnotes: + - # Optional footnotes shown below the border point table --- @@ -38,7 +42,7 @@ params: ## Arrival and Border Points {{< border-points >}} diff --git a/archetypes/country/index.fr.md b/archetypes/country/index.fr.md index cf85b263a..66a2e54e4 100644 --- a/archetypes/country/index.fr.md +++ b/archetypes/country/index.fr.md @@ -4,6 +4,10 @@ country: "{{ .File.ContentBaseName }}" params: operators_without_fip: - # Listez ici les opérateurs ne participant pas au FIP + border_points: + - # IDs des points frontières dans le sens horaire, en commençant par le nord du pays, comme défini dans `content/country/borderpoints.fr.yaml` + border_points_footnotes: + - # Notes de bas de page facultatives sous le tableau des points frontières --- @@ -38,7 +42,7 @@ params: ## Arrivée et points frontières {{< border-points >}} diff --git a/content/country/austria/index.de.md b/content/country/austria/index.de.md index 0bf5342d3..d3885698a 100644 --- a/content/country/austria/index.de.md +++ b/content/country/austria/index.de.md @@ -4,8 +4,8 @@ country: austria params: operators_without_fip: - Achenseebahn - - '[CAT (City Airport Train) - Wien](/operator/oebb#wien-flughafen-city-airport-train-cat "CAT")' + - '[CAT (City Airport Train) Wien](/operator/oebb#wien-flughafen-city-airport-train-cat + "CAT")' - Graz–Köflacher Bahn (GKB) - Montafonerbahn - NÖVOG @@ -16,6 +16,15 @@ params: - WESTbahn - Wiener Lokalbahn (Badner Bahn) - Zillertalbahn + border_points: + - at-cz + - at-sk + - at-hu-gysev + - at-hu-mav + - at-si + - at-it + - at-ch + - at-de --- ## FIP Nutzung diff --git a/content/country/austria/index.en.md b/content/country/austria/index.en.md index 1bbd2bd16..9045bd63f 100644 --- a/content/country/austria/index.en.md +++ b/content/country/austria/index.en.md @@ -4,8 +4,8 @@ country: austria params: operators_without_fip: - Achenseebahn - - '[CAT (City Airport Train) - Vienna](/operator/oebb#vienna-airport-city-airport-train-cat "CAT")' + - '[CAT (City Airport Train) Vienna](/operator/oebb#vienna-airport-city-airport-train-cat + "CAT")' - Graz–Köflacher Bahn (GKB) - Montafonerbahn - NÖVOG @@ -16,6 +16,15 @@ params: - WESTbahn - Wiener Lokalbahn (Badner Bahn) - Zillertalbahn + border_points: + - at-cz + - at-sk + - at-hu-gysev + - at-hu-mav + - at-si + - at-it + - at-ch + - at-de --- ## FIP Information diff --git a/content/country/austria/index.fr.md b/content/country/austria/index.fr.md index 5a7457d4f..f1ac2af72 100644 --- a/content/country/austria/index.fr.md +++ b/content/country/austria/index.fr.md @@ -4,8 +4,8 @@ country: austria params: operators_without_fip: - Achenseebahn - - ’[CAT (City Airport Train) - Vienne](/operator/oebb#aéroport-de-vienne--city-airport-train-cat "CAT")’ + - ’[CAT (City Airport Train) Vienne](/operator/oebb#aéroport-de-vienne--city-airport-train-cat + "CAT")’ - Graz–Köflacher Bahn (GKB) - Montafonerbahn - NÖVOG @@ -16,6 +16,15 @@ params: - WESTbahn - Wiener Lokalbahn (Badner Bahn) - Zillertalbahn + border_points: + - at-cz + - at-sk + - at-hu-gysev + - at-hu-mav + - at-si + - at-it + - at-ch + - at-de --- ## Informations FIP diff --git a/content/country/belgium/index.de.md b/content/country/belgium/index.de.md index db6d69f46..a17b4acc0 100644 --- a/content/country/belgium/index.de.md +++ b/content/country/belgium/index.de.md @@ -5,6 +5,11 @@ params: operators_without_fip: - European Sleeper - OUIGO + border_points: + - be-nl + - be-de + - be-lu + - be-fr --- ## FIP Nutzung diff --git a/content/country/belgium/index.en.md b/content/country/belgium/index.en.md index fdab5b19c..346308ef2 100644 --- a/content/country/belgium/index.en.md +++ b/content/country/belgium/index.en.md @@ -5,6 +5,11 @@ params: operators_without_fip: - European Sleeper - OUIGO + border_points: + - be-nl + - be-de + - be-lu + - be-fr --- ## FIP Information diff --git a/content/country/belgium/index.fr.md b/content/country/belgium/index.fr.md index 26573527a..d29bf3099 100644 --- a/content/country/belgium/index.fr.md +++ b/content/country/belgium/index.fr.md @@ -5,6 +5,11 @@ params: operators_without_fip: - European Sleeper - OUIGO + border_points: + - be-nl + - be-de + - be-lu + - be-fr --- ## Informations FIP diff --git a/content/country/borderpoints.de.yaml b/content/country/borderpoints.de.yaml index 523e99f0c..d7dd40760 100644 --- a/content/country/borderpoints.de.yaml +++ b/content/country/borderpoints.de.yaml @@ -1,980 +1,1106 @@ -countries: - austria: - order: [at-cz, at-sk, at-hu-gysev, at-hu-mav, at-si, at-it, at-ch, at-de] - belgium: - order: [be-nl, be-de, be-lu, be-fr] - bosnia-and-herzegovina: - order: [ba-hr, ba-rs] - bulgaria: - order: [bg-ro, bg-tr, bg-gr, bg-rs] - czechia: - order: [cz-pl, cz-sk, at-cz, cz-de] - denmark: - order: [dk-se, dk-de] - france: - order: [fr-eurostar, be-fr, lu-fr, de-fr, fr-ch, fr-it, es-fr] - germany: - order: - [ - dk-de, - de-se, - de-pl, - cz-de, - at-de, - de-bsb, - de-ch, - de-fr, - de-lu, - be-de, - de-eurostar, - de-nl, - ] - footnotes: - - "MS = Mitte See" - greece: - order: [gr-mk, bg-gr, gr-tr, gr-it] - footnotes: - - "[>] = In Richtung (z. B. Patras [> Ancona] = Patras ist der Grenzpunkt - in Richtung Ancona)" - hungary: - order: - [ - hu-sk-mav, - hu-sk-gysev, - hu-ua, - hu-ro, - hu-rs, - hu-hr, - hu-si, - at-hu-mav, - at-hu-gysev, - ] - ireland: - order: [ie-gb-rail, ie-gb-sll] - italy: - order: [at-it, it-si, gr-it, fr-it, it-ch] - footnotes: - - "[>] = In Richtung (z. B. Domodossola [> Locarno] = Domodossola ist der - Grenzpunkt in Richtung Locarno)" - latvia: - order: [lv-ee, lv-ru, lv-by, lv-lt] - lithuania: - order: [lv-lt, lt-by, lt-pl, lt-ru] - luxembourg: - order: [be-lu, de-lu, lu-fr] - montenegro: - order: [me-rs] - netherlands: - order: [de-nl, be-nl, nl-gb-stl] - norway: - order: [no-se] - poland: - order: [pl-ru, lt-pl, pl-by, pl-ua, pl-sk, cz-pl, de-pl] - portugal: - order: [pt-es] - footnotes: - - "[>] = In Richtung (z. B. V. Real de Sto António Guardiana [> Ayamonte] = - V. Real de Sto António Guardiana ist der Grenzpunkt in Richtung - Ayamonte)" - romania: - order: [ro-ua, ro-md, bg-ro, ro-rs, hu-ro] - serbia: - order: [hu-rs, ro-rs, bg-rs, rs-mk, me-rs, ba-rs, rs-hr] - slovakia: - order: [hu-sk-gysev, hu-sk-mav, cz-sk] - slovenia: - order: [it-si, si-hr, at-si, hu-si] - spain: - order: [pt-es, es-fr] - switzerland: - order: [de-ch, at-ch, it-ch, fr-ch] - footnotes: - - "[>] = In Richtung (z. B. Locarno [> Domodossola] = Locarno ist der - Grenzpunkt in Richtung Domodossola)" - united-kingdom: - order: [nl-gb-stl, gb-eurostar, ie-gb-rail, ie-gb-sll, gb-gb-sll] - -borders: - - id: at-cz - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: czechia } - operators: [{ id: cd }] - points: - - "Bernhardsthal (Gr) / Břeclav (Gr)" - - "Unterretzbach (Gr) / Retz (Gr)" - - "Gmünd (Gr) / Česká Skalice (Gr)" - - "Summerau (Gr) / Horní Dvořiště (Gr)" - - - id: at-sk - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: slovakia } - operators: [{ id: zssk }] - points: - - "Marchegg (Gr)" - - "Kittsee (Gr)" - - - id: at-hu-gysev - a: - country: { id: austria } - operators: [{ id: gysev }] - b: - country: { id: hungary } - operators: [{ id: gysev }] - points: - - "Pamhagen (Gr)" - - "Szentgotthárd" - - "Sopron" - - - id: at-hu-mav - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: hungary } - operators: [{ id: mav }] - points: - - "Hegyeshalom (Gr)" - - "Sopron" - - - id: at-si - sort: true - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: slovenia } - operators: [{ id: sz }] - points: - - "Bleiburg (Gr) (Slowenisch: Pliberk)" - - "Spielfeld-Strass (Gr) / Spielfeld (Gr) (Slowenisch: Špilje)" - - "Rosenbach (Gr) / Jesenice (Gr) (Deutsch: Assling)" - - - id: at-it - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: italy } - operators: [{ id: fs }] - points: - - "Brennero/Brenner" - - "San Candido/Innichen" - - "Tarvisio Boscoverde" - - - id: at-ch - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: switzerland } - operators: [{ id: sbb }] - points: - - "Buchs SG" - - "St. Margrethen" - - - id: at-de - sort: true - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: germany } - operators: [{ id: db }] - points: - - "Passau Hbf" - - "Salzburg Hbf (im NV bis Salzburg Liefering)" - - "Simbach am Inn" - - "Kufstein" - - "Mittenwald (Gr)" - - "Lindau-Reutin" - - - id: be-nl - a: - country: { id: belgium } - operators: [{ id: sncb }] - b: - country: { id: netherlands } - operators: [{ id: ns }] - points: - - "Roosendaal (fr)" - - "Visé (fr)" - - - id: be-de - a: - country: { id: belgium } - operators: [{ id: sncb }] - b: - country: { id: germany } - operators: [{ id: db }] - points: - - "Aachen Süd (Gr)" - - - id: be-lu - a: - country: { id: belgium } - operators: [{ id: sncb }] - b: - country: { id: luxembourg } - operators: [{ id: cfl }] - points: - - "Athus" - - "Gouvy (fr)" - - "Sterpenich (fr)" - - - id: be-fr - a: - country: { id: belgium } - operators: [{ id: sncb }] - b: - country: { id: france } - operators: [{ id: sncf }] - points: - - "Blandain (fr)" - - "Givet (fr)" - - "Jeumont (fr)" - - "Quévy (fr)" - - "Tourcoing (fr)" - - - id: ba-hr - a: - country: { id: bosnia-and-herzegovina } - operators: [{ id: zfbh }, { id: zrs }] - b: - country: { label: Kroatien } - operators: [{ label: HŽ }] - points: - - "Brčko (Gr)" - - "Martin Brod (Gr)" - - "Metković (Gr)" - - "Slavonski Šamac (Gr)" - - "Volinja (Gr)" - - - id: ba-rs - a: - country: { id: bosnia-and-herzegovina } - operators: [{ id: zfbh }, { id: zrs }] - b: - country: { id: serbia } - operators: [{ id: sv }] - points: - - "Zvornik" - - - id: bg-ro - a: - country: { id: bulgaria } - operators: [{ id: bdz }] - b: - country: { id: romania } - operators: [{ id: cfr }] - points: - - "Ruse (fr) (bulgarisch: Русе)" - - "Vidin (fr)" - - - id: bg-tr - a: - country: { id: bulgaria } - operators: [{ id: bdz }] - b: - country: { label: Türkei } - operators: [{ label: TCDD }] - points: - - "Kapikule (fr)" - - - id: bg-gr - a: - country: { id: bulgaria } - operators: [{ id: bdz }] - b: - country: { id: greece } - operators: [{ id: ht }] - points: - - "Kulata (fr) (bulgarisch: Кулата)" - - "Svilengrad (fr) (bulgarisch: Свиленград)" - - - id: bg-rs - a: - country: { id: bulgaria } - operators: [{ id: bdz }] - b: - country: { id: serbia } - operators: [{ id: sv }] - points: - - "Dimitrovgrad (fr) (bulgarisch: Цариброд, Tsaribrod)" - - - id: cz-pl - a: - country: { id: czechia } - operators: [{ id: cd }] - b: - country: { id: poland } - operators: [{ id: pkp }, { id: kd }, { id: ks }] - points: - - "Bohumín (Gr)" - - "Český Těšín (Gr)" - - "Głuchołazy (Gr) (tschechisch: Hlucholazy)" - - "Harrachov (Gr)" - - "Lichkov (Gr) (Plhy City)" - - "Zebrzydowice (Gr)" - - "Schlesische Woiwodschaft (Silesian Voivodeship)" - - - id: cz-sk - a: - country: { id: czechia } - operators: [{ id: cd }] - b: - country: { id: slovakia } - operators: [{ id: zssk }] - points: - - "Čadca (Gr)" - - "Hodonín (Gr)" - - "Horní Lideč (Gr)" - - "Kúty (Gr)" - - "Myjava (Gr)" - - "Nemšová (Gr)" - - "Skalica na Slovensku (Gr)" - - - id: cz-de - sort: true - a: - country: { id: czechia } - operators: [{ id: cd }] - b: - country: { id: germany } - operators: [{ id: db }] - points: - - "Selb-Plößberg (Gr) / Aš (Gr)" - - "Bayerisch Eisenstein (tschechisch: Bavorská Železná ruda)" - - "Cheb (Gr)" - - "Sebnitz (Gr) / Dolní Poustevna (Gr)" - - "Furth im Wald (Gr)" - - "Zittau (Gr)" - - "Potůčky (Gr)" - - "Schöna (Gr)" - - "Rumburk (Gr)" - - "Vejprty (Gr)" - - "Vojtanov (Gr)" - - "Kraslice (Gr)" - - "Waidhaus (Gr)" - - - id: dk-se - a: - country: { id: denmark } - operators: [{ id: dsb }] - b: - country: { label: Schweden } - operators: [{ label: SJ }] - points: - - "Helsingborg (über Helsingør)" - - - id: dk-de - a: - country: { id: denmark } - operators: [{ id: dsb }] - b: - country: { id: germany } - operators: [{ id: db }] - points: - - "Flensburg (Gr)" - - "Puttgarden (MS) (über Rødby Faerge)" - - "Tønder (Gr)" - - "Warnemünde (über Gedser)" - - - id: de-se - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { label: Schweden } - operators: [{ label: SJ }] - points: - - "Lübeck-Travemünde Hafen" - - "Lübeck-Travemünde Skandinavienkai" - - "Sassnitz (Gr)" - - - id: de-pl - sort: true - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { id: poland } - operators: [{ id: pkp }] - points: - - "Ahlbeck (Gr)" - - "Forst (Gr)" - - "Frankfurt (Oder) (Gr)" - - "Grambow (Gr)" - - "Gubin (Gr)" - - "Horka (Gr)" - - "Kostrzyn (Gr)" - - "Tantow (Gr)" - - "Zgorzelec (Gr)" - - - id: de-bsb - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: null - operators: [{ id: bsb }] - points: - - "Friedrichshafen" - - "Langenargen" - - "Lindau" - - "Konstanz" - - "Radolfzell" - - "Schaffhausen" - - "Überlingen" - - - id: de-ch - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { id: switzerland } - operators: [{ id: sbb }, { id: bls }, { id: sp }] - points: - - "Basel Bad Bf" - - "Konstanz" - - "Schaffhausen" - - "Waldshut" - - - id: de-fr - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { id: france } - operators: [{ id: sncf }] - points: - - "Apach (fr)" - - "Forbach (fr)" - - "Hanweiler (Gr)" - - "Kehl (Gr)" - - "Lauterbourg (fr)" - - "Neuenburg (Bd) (Gr)" - - "Wissembourg (fr)" - - - id: de-lu - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { id: luxembourg } - operators: [{ id: cfl }] - points: - - "Igel (Gr)" - - - id: de-eurostar - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: null - operators: [{ id: eurostar }] - points: - - "Aachen" - - "Duisburg" - - "Düsseldorf" - - "Düsseldorf Airport" - - "Essen" - - "Köln" - - - id: de-nl - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { id: netherlands } - operators: [{ id: ns }] - points: - - "Bad Bentheim (Gr)" - - "Emmerich (Gr)" - - "Gronau (Westf) (Gr)" - - "Herzogenrath (Gr)" - - "Venlo (Gr)" - - "Weener (Gr)" - - - id: gr-mk - a: - country: { id: greece } - operators: [{ id: ht }] - b: - country: { label: Nordmazedonien } - operators: [{ label: ŽRSM }] - points: - - "Gevgelija (fr)" - - - id: gr-tr - a: - country: { id: greece } - operators: [{ id: ht }] - b: - country: { label: Türkei } - operators: [{ label: TCDD }] - points: - - "Pythio (Πύθιο)" - - - id: gr-it - a: - country: { id: greece } - operators: [{ id: attica }] - b: - country: { id: italy } - operators: [{ id: attica }] - points: - - "Patras (Πάτρα) [>Ancona, >Bari]" - - "Ancona [>Igoumenitsa, >Patras]" - - "Bari [>Igoumenitsa, >Patras]" - - - id: hu-sk-mav - a: - country: { id: hungary } - operators: [{ id: mav }] - b: - country: { id: slovakia } - operators: [{ id: zssk }] - points: - - "Bánréve (Gr)" - - "Čaňa (Gr)" - - "Fiľakovo (Gr)" - - "Komárom (Gr)" - - "Sátoraljaújhely (Gr)" - - "Szob (Gr)" - - - id: hu-sk-gysev - a: - country: { id: hungary } - operators: [{ id: gysev }] - b: - country: { id: slovakia } - operators: [{ id: gysev }] - points: - - "Rajka (Gr)" - - - id: hu-ua - a: - country: { id: hungary } - operators: [{ id: mav }] - b: - country: { label: Ukraine } - operators: [{ label: UZ }] - points: - - "Záhony (Gr)" - - - id: hu-ro - a: - country: { id: hungary } - operators: [{ id: mav }] - b: - country: { id: romania } - operators: [{ id: cfr }] - points: - - "Biharkeresztes (fr)" - - "Curtici (fr) (ungarisch: Kürtös)" - - "Nyirábrány (fr)" - - "Salonta (fr) (ungarisch: Nagyszalonta, Szalonta)" - - - id: hu-rs - a: - country: { id: hungary } - operators: [{ id: mav }] - b: - country: { id: serbia } - operators: [{ id: sv }] - points: - - "Röszke (Gr)" - - "Subotica (Gr)" - - - id: hu-hr - a: - country: { id: hungary } - operators: [{ id: mav }] - b: - country: { label: Kroatien } - operators: [{ label: HŽ }] - points: - - "Koprivnica (Gr)" - - "Kotoriba (Gr)" - - "Magyarbóly (Gr)" - - - id: hu-si - a: - country: { id: hungary } - operators: [{ id: mav }, { id: gysev }] - b: - country: { id: slovenia } - operators: [{ id: sz }] - points: - - "Hodoš (Gr) (Őrihodos)" - - - id: ie-gb-rail - a: - country: { id: ireland } - operators: [{ id: cie }] - b: - country: { id: united-kingdom } - operators: [{ id: nir }] - points: - - "Dundalk" - - - id: ie-gb-sll - a: - country: { id: ireland } - operators: [{ id: sll }] - b: - country: { id: united-kingdom } - operators: [{ id: sll }] - points: - - "Dublin Bay / Holyhead" - - "Rosslare / Fishguard" - - - id: it-si - a: - country: { id: italy } - operators: [{ id: fs }] - b: - country: { id: slovenia } - operators: [{ id: sz }] - points: - - "Nova Gorica (fr)" - - "Villa Opicina (fr) (Slowenisch: Opčine, Triestisch: Opcina)" - - - id: fr-it - a: - country: { id: france } - operators: [{ id: sncf }] - b: - country: { id: italy } - operators: [{ id: fs }] - points: - - "Limone-Confine" - - "Modane (fr)" - - "Piene (fr)" - - "Ventimiglia (fr)" - - - id: it-ch - sort: true - a: - country: { id: italy } - operators: [{ id: fs }] - b: - country: { id: switzerland } - operators: [{ id: sbb }, { id: bls }, { id: sp }] - points: - - "Chiasso" - - "Domodossola" - - "Iselle transito [> Brig]" - - "Iselle di Trasquera [> Domodossola]" - - "Domodossola [> Locarno]" - - "Locarno [> Domodossola]" - - "Porto Ceresio [> Lugano]" - - "Lugano [> Porto Ceresio]" - - "Pino transito" - - "Tirano" - - - id: fr-ch - a: - country: { id: france } - operators: [{ id: sncf }] - b: - country: { id: switzerland } - operators: [{ id: sbb }, { id: bls }, { id: sp }] - points: - - "Annemasse" - - "Basel SBB" - - "Delle (fr)" - - "Genève [> Bellegarde]" - - "Le Châtelard-Frontière (fr)" - - "Le Locle-Col-des-Roches" - - "Les Verrières (fr)" - - "Vallorbe" - - - id: lu-fr - a: - country: { id: luxembourg } - operators: [{ id: cfl }] - b: - country: { id: france } - operators: [{ id: sncf }] - points: - - "Bettembourg (fr)" - - "Rodange (fr)" - - - id: es-fr - a: - country: { id: spain } - operators: [{ id: renfe }] - b: - country: { id: france } - operators: [{ id: sncf }] - points: - - "Canfranc (fr)" - - "Hendaye (fr)" - - "Port Bou (fr)" - - "La Tour-de-Carol-Enveitg" - - - id: fr-eurostar - a: - country: { id: france } - operators: [{ id: sncf }] - b: - country: null - operators: [{ id: eurostar }] - points: - - "Paris" - - "Lille" - - - id: gb-eurostar - a: - country: { id: united-kingdom } - operators: [{ id: gb }] - b: - country: { id: france } - operators: [{ id: eurostar }] - points: - - "London St. Pancras International" - - - id: nl-gb-stl - a: - country: { id: netherlands } - operators: [{ id: stl }] - b: - country: { id: united-kingdom } - operators: [{ id: stl }] - points: - - "Hoek van Holland / Harwich P.Q." - - - id: gb-gb-sll - a: - country: { id: united-kingdom } - operators: [{ id: sll }] - b: - country: { id: united-kingdom } - operators: [{ id: sll }] - points: - - "Cairnryan" - - "Liverpool" - - "Belfast" - - - id: lv-ee - a: - country: { id: latvia } - operators: [{ label: LDz }] - b: - country: { label: Estland } - points: - - "Valga" - - - id: lv-ru - a: - country: { id: latvia } - operators: [{ label: LDz }] - b: - country: { label: Russland } - points: - - "Grenze gesperrt" - - - id: lv-by - a: - country: { id: latvia } - operators: [{ label: LDz }] - b: - country: { label: Belarus/Weißrussland } - points: - - "Grenze gesperrt" - - - id: lv-lt - a: - country: { id: latvia } - operators: [{ label: LDz }] - b: - country: { id: lithuania } - operators: [{ id: ltg }] - points: - - "Joniškis" - - - id: lt-by - a: - country: { id: lithuania } - operators: [{ id: ltg }] - b: - country: { label: Belarus/Weißrussland } - points: - - "Grenze gesperrt" - - - id: lt-pl - a: - country: { id: lithuania } - operators: [{ id: ltg }] - b: - country: { id: poland } - operators: [{ id: pkp }] - points: - - "Mockava (Gr)" - - - id: lt-ru - a: - country: { id: lithuania } - operators: [{ id: ltg }] - b: - country: { label: Russland } - points: - - "Kein Ein-/Ausstieg im Transitverkehr Russland-Belarus-Litauen-Kaliningrad" - - - id: me-rs - a: - country: { id: montenegro } - operators: [{ id: zpcg }] - b: - country: { id: serbia } - operators: [{ id: sv }] - points: - - "Bijelo Polje (Gr)" - - - id: no-se - a: - country: { id: norway } - operators: [{ id: vy }] - b: - country: { label: Schweden } - operators: [{ label: SJ }] - points: - - "Bjørnfjell (Gr)" - - "Halden (Kornsjø (Gr))" - - "Kongsvinger (Charlottenberg (Gr))" - - "Storlien" - - - id: pl-ru - a: - country: { id: poland } - operators: [{ id: pkp }] - b: - country: { label: Russland } - operators: [{ label: RZD }] - points: - - "Braniewo (Gr)" - - - id: pl-by - a: - country: { id: poland } - operators: [{ id: pkp }] - b: - country: { label: Belarus / Weißrussland } - operators: [{ label: BC }] - points: - - "Brest (Gr) (Брэст)" - - "Bruzgi / Bruzhi (Gr)" - - "Czeremcha (Gr) (Podlaskie Voivodeship)" - - - id: pl-ua - a: - country: { id: poland } - operators: [{ id: pkp }] - b: - country: { label: Ukraine } - operators: [{ label: UZ }] - points: - - "Jagodin (Gr) (Yahodyn, Yagodyn oder Ягодин)" - - "Medyka (Gr)" - - - id: pl-sk - a: - country: { id: poland } - operators: [{ id: pkp }] - b: - country: { id: slovakia } - operators: [{ id: zssk }] - points: - - "Lupkow (Gr)" - - - id: ro-ua - a: - country: { id: romania } - operators: [{ id: cfr }] - b: - country: { label: Ukraine } - operators: [{ label: UZ }] - points: - - "Vicsani (fr)" - - - id: ro-md - a: - country: { id: romania } - operators: [{ id: cfr }] - b: - country: { label: Moldau } - operators: [{ label: CFM }] - points: - - "Iasi" - - "Ungheni (fr)" - - - id: ro-rs - a: - country: { id: romania } - operators: [{ id: cfr }] - b: - country: { id: serbia } - operators: [{ id: sv }] - points: - - "Jimbolia (fr) (serbisch: Жомбољ)" - - "Vršac (fr) (serbisch: Вршац)" - - - id: rs-mk - a: - country: { id: serbia } - operators: [{ id: sv }] - b: - country: { label: Nordmazedonien } - operators: [{ label: ŽRSM }] - points: - - "Tabanovci (fr) (Serbisch: Табановце; Albanisch: Tabanoc)" - - - id: rs-hr - a: - country: { id: serbia } - operators: [{ id: sv }] - b: - country: { label: Kroatien } - operators: [{ label: HŽ }] - points: - - "Erdut (Gr) (Serbisch: Ердут)" - - "Šid (Gr) (Serbisch: Шид)" - - - id: si-hr - a: - country: { id: slovenia } - operators: [{ id: sz }] - b: - country: { label: Kroatien } - operators: [{ label: HŽ }] - points: - - "Buzet (Gr)" - - "Čakovec (Gr)" - - "Dobova (Gr)" - - "Kumrovec (Gr)" - - "Metlika (Gr)" - - "Mursko Središće (Gr)" - - "Rogatec (Gr)" - - "Šapjane (Gr)" - - - id: pt-es - a: - country: { id: portugal } - operators: [{ id: cp }] - b: - country: { id: spain } - operators: [{ id: renfe }] - points: - - "Badajoz (fr)" - - "Barca de Alva (fr)" - - "Fuentes de Oñoro (fr)" - - "Valença (fr)" - - "Valencia de Alcántara (fr)" - - "V. Real de Sto António Guardiana [> Ayamonte]" +- id: at-cz + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: czechia + operators: + - id: cd + points: + - Bernhardsthal (Gr) / Břeclav (Gr) + - Unterretzbach (Gr) / Retz (Gr) + - Gmünd (Gr) / Česká Skalice (Gr) + - Summerau (Gr) / Horní Dvořiště (Gr) +- id: at-sk + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: slovakia + operators: + - id: zssk + points: + - Marchegg (Gr) + - Kittsee (Gr) +- id: at-hu-gysev + a: + country: + id: austria + operators: + - id: gysev + b: + country: + id: hungary + operators: + - id: gysev + points: + - Pamhagen (Gr) + - Szentgotthárd + - Sopron +- id: at-hu-mav + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: hungary + operators: + - id: mav + points: + - Hegyeshalom (Gr) + - Sopron +- id: at-si + sort: true + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: slovenia + operators: + - id: sz + points: + - "Bleiburg (Gr) (Slowenisch: Pliberk)" + - "Spielfeld-Strass (Gr) / Spielfeld (Gr) (Slowenisch: Špilje)" + - "Rosenbach (Gr) / Jesenice (Gr) (Deutsch: Assling)" +- id: at-it + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: italy + operators: + - id: fs + points: + - Brennero/Brenner + - San Candido/Innichen + - Tarvisio Boscoverde +- id: at-ch + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: switzerland + operators: + - id: sbb + points: + - Buchs SG + - St. Margrethen +- id: at-de + sort: true + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: germany + operators: + - id: db + points: + - Passau Hbf + - Salzburg Hbf (im NV bis Salzburg Liefering) + - Simbach am Inn + - Kufstein + - Mittenwald (Gr) + - Lindau-Reutin +- id: be-nl + a: + country: + id: belgium + operators: + - id: sncb + b: + country: + id: netherlands + operators: + - id: ns + points: + - Roosendaal (fr) + - Visé (fr) +- id: be-de + a: + country: + id: belgium + operators: + - id: sncb + b: + country: + id: germany + operators: + - id: db + points: + - Aachen Süd (Gr) +- id: be-lu + a: + country: + id: belgium + operators: + - id: sncb + b: + country: + id: luxembourg + operators: + - id: cfl + points: + - Athus + - Gouvy (fr) + - Sterpenich (fr) +- id: be-fr + a: + country: + id: belgium + operators: + - id: sncb + b: + country: + id: france + operators: + - id: sncf + points: + - Blandain (fr) + - Givet (fr) + - Jeumont (fr) + - Quévy (fr) + - Tourcoing (fr) +- id: ba-hr + a: + country: + id: bosnia-and-herzegovina + operators: + - id: zfbh + - id: zrs + b: + country: + label: Kroatien + operators: + - label: HŽ + points: + - Brčko (Gr) + - Martin Brod (Gr) + - Metković (Gr) + - Slavonski Šamac (Gr) + - Volinja (Gr) +- id: ba-rs + a: + country: + id: bosnia-and-herzegovina + operators: + - id: zfbh + - id: zrs + b: + country: + id: serbia + operators: + - id: sv + points: + - Zvornik +- id: bg-ro + a: + country: + id: bulgaria + operators: + - id: bdz + b: + country: + id: romania + operators: + - id: cfr + points: + - "Ruse (fr) (bulgarisch: Русе)" + - Vidin (fr) +- id: bg-tr + a: + country: + id: bulgaria + operators: + - id: bdz + b: + country: + label: Türkei + operators: + - label: TCDD + points: + - Kapikule (fr) +- id: bg-gr + a: + country: + id: bulgaria + operators: + - id: bdz + b: + country: + id: greece + operators: + - id: ht + points: + - "Kulata (fr) (bulgarisch: Кулата)" + - "Svilengrad (fr) (bulgarisch: Свиленград)" +- id: bg-rs + a: + country: + id: bulgaria + operators: + - id: bdz + b: + country: + id: serbia + operators: + - id: sv + points: + - "Dimitrovgrad (fr) (bulgarisch: Цариброд, Tsaribrod)" +- id: cz-pl + a: + country: + id: czechia + operators: + - id: cd + b: + country: + id: poland + operators: + - id: pkp + - id: kd + - id: ks + points: + - Bohumín (Gr) + - Český Těšín (Gr) + - "Głuchołazy (Gr) (tschechisch: Hlucholazy)" + - Harrachov (Gr) + - Lichkov (Gr) (Plhy City) + - Zebrzydowice (Gr) + - Schlesische Woiwodschaft (Silesian Voivodeship) +- id: cz-sk + a: + country: + id: czechia + operators: + - id: cd + b: + country: + id: slovakia + operators: + - id: zssk + points: + - Čadca (Gr) + - Hodonín (Gr) + - Horní Lideč (Gr) + - Kúty (Gr) + - Myjava (Gr) + - Nemšová (Gr) + - Skalica na Slovensku (Gr) +- id: cz-de + sort: true + a: + country: + id: czechia + operators: + - id: cd + b: + country: + id: germany + operators: + - id: db + points: + - Selb-Plößberg (Gr) / Aš (Gr) + - "Bayerisch Eisenstein (tschechisch: Bavorská Železná ruda)" + - Cheb (Gr) + - Sebnitz (Gr) / Dolní Poustevna (Gr) + - Furth im Wald (Gr) + - Zittau (Gr) + - Potůčky (Gr) + - Schöna (Gr) + - Rumburk (Gr) + - Vejprty (Gr) + - Vojtanov (Gr) + - Kraslice (Gr) + - Waidhaus (Gr) +- id: dk-se + a: + country: + id: denmark + operators: + - id: dsb + b: + country: + label: Schweden + operators: + - label: SJ + points: + - Helsingborg (über Helsingør) +- id: dk-de + a: + country: + id: denmark + operators: + - id: dsb + b: + country: + id: germany + operators: + - id: db + points: + - Flensburg (Gr) + - Puttgarden (MS) (über Rødby Faerge) + - Tønder (Gr) + - Warnemünde (über Gedser) +- id: de-se + a: + country: + id: germany + operators: + - id: db + b: + country: + label: Schweden + operators: + - label: SJ + points: + - Lübeck-Travemünde Hafen + - Lübeck-Travemünde Skandinavienkai + - Sassnitz (Gr) +- id: de-pl + sort: true + a: + country: + id: germany + operators: + - id: db + b: + country: + id: poland + operators: + - id: pkp + points: + - Ahlbeck (Gr) + - Forst (Gr) + - Frankfurt (Oder) (Gr) + - Grambow (Gr) + - Gubin (Gr) + - Horka (Gr) + - Kostrzyn (Gr) + - Tantow (Gr) + - Zgorzelec (Gr) +- id: de-bsb + a: + country: + id: germany + operators: + - id: db + b: + country: + operators: + - id: bsb + points: + - Friedrichshafen + - Langenargen + - Lindau + - Konstanz + - Radolfzell + - Schaffhausen + - Überlingen +- id: de-ch + a: + country: + id: germany + operators: + - id: db + b: + country: + id: switzerland + operators: + - id: sbb + - id: bls + - id: sp + points: + - Basel Bad Bf + - Konstanz + - Schaffhausen + - Waldshut +- id: de-fr + a: + country: + id: germany + operators: + - id: db + b: + country: + id: france + operators: + - id: sncf + points: + - Apach (fr) + - Forbach (fr) + - Hanweiler (Gr) + - Kehl (Gr) + - Lauterbourg (fr) + - Neuenburg (Bd) (Gr) + - Wissembourg (fr) +- id: de-lu + a: + country: + id: germany + operators: + - id: db + b: + country: + id: luxembourg + operators: + - id: cfl + points: + - Igel (Gr) +- id: de-eurostar + a: + country: + id: germany + operators: + - id: db + b: + country: + operators: + - id: eurostar + points: + - Aachen + - Duisburg + - Düsseldorf + - Düsseldorf Airport + - Essen + - Köln +- id: de-nl + a: + country: + id: germany + operators: + - id: db + b: + country: + id: netherlands + operators: + - id: ns + points: + - Bad Bentheim (Gr) + - Emmerich (Gr) + - Gronau (Westf) (Gr) + - Herzogenrath (Gr) + - Venlo (Gr) + - Weener (Gr) +- id: gr-mk + a: + country: + id: greece + operators: + - id: ht + b: + country: + label: Nordmazedonien + operators: + - label: ŽRSM + points: + - Gevgelija (fr) +- id: gr-tr + a: + country: + id: greece + operators: + - id: ht + b: + country: + label: Türkei + operators: + - label: TCDD + points: + - Pythio (Πύθιο) +- id: gr-it + a: + country: + id: greece + operators: + - id: attica + b: + country: + id: italy + operators: + - id: attica + points: + - Patras (Πάτρα) [>Ancona, >Bari] + - Ancona [>Igoumenitsa, >Patras] + - Bari [>Igoumenitsa, >Patras] +- id: hu-sk-mav + a: + country: + id: hungary + operators: + - id: mav + b: + country: + id: slovakia + operators: + - id: zssk + points: + - Bánréve (Gr) + - Čaňa (Gr) + - Fiľakovo (Gr) + - Komárom (Gr) + - Sátoraljaújhely (Gr) + - Szob (Gr) +- id: hu-sk-gysev + a: + country: + id: hungary + operators: + - id: gysev + b: + country: + id: slovakia + operators: + - id: gysev + points: + - Rajka (Gr) +- id: hu-ua + a: + country: + id: hungary + operators: + - id: mav + b: + country: + label: Ukraine + operators: + - label: UZ + points: + - Záhony (Gr) +- id: hu-ro + a: + country: + id: hungary + operators: + - id: mav + b: + country: + id: romania + operators: + - id: cfr + points: + - Biharkeresztes (fr) + - "Curtici (fr) (ungarisch: Kürtös)" + - Nyirábrány (fr) + - "Salonta (fr) (ungarisch: Nagyszalonta, Szalonta)" +- id: hu-rs + a: + country: + id: hungary + operators: + - id: mav + b: + country: + id: serbia + operators: + - id: sv + points: + - Röszke (Gr) + - Subotica (Gr) +- id: hu-hr + a: + country: + id: hungary + operators: + - id: mav + b: + country: + label: Kroatien + operators: + - label: HŽ + points: + - Koprivnica (Gr) + - Kotoriba (Gr) + - Magyarbóly (Gr) +- id: hu-si + a: + country: + id: hungary + operators: + - id: mav + - id: gysev + b: + country: + id: slovenia + operators: + - id: sz + points: + - Hodoš (Gr) (Őrihodos) +- id: ie-gb-rail + a: + country: + id: ireland + operators: + - id: cie + b: + country: + id: united-kingdom + operators: + - id: nir + points: + - Dundalk +- id: ie-gb-sll + a: + country: + id: ireland + operators: + - id: sll + b: + country: + id: united-kingdom + operators: + - id: sll + points: + - Dublin Bay / Holyhead + - Rosslare / Fishguard +- id: it-si + a: + country: + id: italy + operators: + - id: fs + b: + country: + id: slovenia + operators: + - id: sz + points: + - Nova Gorica (fr) + - "Villa Opicina (fr) (Slowenisch: Opčine, Triestisch: Opcina)" +- id: fr-it + a: + country: + id: france + operators: + - id: sncf + b: + country: + id: italy + operators: + - id: fs + points: + - Limone-Confine + - Modane (fr) + - Piene (fr) + - Ventimiglia (fr) +- id: it-ch + sort: true + a: + country: + id: italy + operators: + - id: fs + b: + country: + id: switzerland + operators: + - id: sbb + - id: bls + - id: sp + points: + - Chiasso + - Domodossola + - Iselle transito [> Brig] + - Iselle di Trasquera [> Domodossola] + - Domodossola [> Locarno] + - Locarno [> Domodossola] + - Porto Ceresio [> Lugano] + - Lugano [> Porto Ceresio] + - Pino transito + - Tirano +- id: fr-ch + a: + country: + id: france + operators: + - id: sncf + b: + country: + id: switzerland + operators: + - id: sbb + - id: bls + - id: sp + points: + - Annemasse + - Basel SBB + - Delle (fr) + - Genève [> Bellegarde] + - Le Châtelard-Frontière (fr) + - Le Locle-Col-des-Roches + - Les Verrières (fr) + - Vallorbe +- id: lu-fr + a: + country: + id: luxembourg + operators: + - id: cfl + b: + country: + id: france + operators: + - id: sncf + points: + - Bettembourg (fr) + - Rodange (fr) +- id: es-fr + a: + country: + id: spain + operators: + - id: renfe + b: + country: + id: france + operators: + - id: sncf + points: + - Canfranc (fr) + - Hendaye (fr) + - Port Bou (fr) + - La Tour-de-Carol-Enveitg +- id: fr-eurostar + a: + country: + id: france + operators: + - id: sncf + b: + country: + operators: + - id: eurostar + points: + - Paris + - Lille +- id: gb-eurostar + a: + country: + id: united-kingdom + operators: + - id: gb + b: + country: + id: france + operators: + - id: eurostar + points: + - London St. Pancras International +- id: nl-gb-stl + a: + country: + id: netherlands + operators: + - id: stl + b: + country: + id: united-kingdom + operators: + - id: stl + points: + - Hoek van Holland / Harwich P.Q. +- id: gb-gb-sll + a: + country: + id: united-kingdom + operators: + - id: sll + b: + country: + id: united-kingdom + operators: + - id: sll + points: + - Cairnryan + - Liverpool + - Belfast +- id: lv-ee + a: + country: + id: latvia + operators: + - label: LDz + b: + country: + label: Estland + points: + - Valga +- id: lv-ru + a: + country: + id: latvia + operators: + - label: LDz + b: + country: + label: Russland + points: + - Grenze gesperrt +- id: lv-by + a: + country: + id: latvia + operators: + - label: LDz + b: + country: + label: Belarus/Weißrussland + points: + - Grenze gesperrt +- id: lv-lt + a: + country: + id: latvia + operators: + - label: LDz + b: + country: + id: lithuania + operators: + - id: ltg + points: + - Joniškis +- id: lt-by + a: + country: + id: lithuania + operators: + - id: ltg + b: + country: + label: Belarus/Weißrussland + points: + - Grenze gesperrt +- id: lt-pl + a: + country: + id: lithuania + operators: + - id: ltg + b: + country: + id: poland + operators: + - id: pkp + points: + - Mockava (Gr) +- id: lt-ru + a: + country: + id: lithuania + operators: + - id: ltg + b: + country: + label: Russland + points: + - Kein Ein-/Ausstieg im Transitverkehr Russland-Belarus-Litauen-Kaliningrad +- id: me-rs + a: + country: + id: montenegro + operators: + - id: zpcg + b: + country: + id: serbia + operators: + - id: sv + points: + - Bijelo Polje (Gr) +- id: no-se + a: + country: + id: norway + operators: + - id: vy + b: + country: + label: Schweden + operators: + - label: SJ + points: + - Bjørnfjell (Gr) + - Halden (Kornsjø (Gr)) + - Kongsvinger (Charlottenberg (Gr)) + - Storlien +- id: pl-ru + a: + country: + id: poland + operators: + - id: pkp + b: + country: + label: Russland + operators: + - label: RZD + points: + - Braniewo (Gr) +- id: pl-by + a: + country: + id: poland + operators: + - id: pkp + b: + country: + label: Belarus / Weißrussland + operators: + - label: BC + points: + - Brest (Gr) (Брэст) + - Bruzgi / Bruzhi (Gr) + - Czeremcha (Gr) (Podlaskie Voivodeship) +- id: pl-ua + a: + country: + id: poland + operators: + - id: pkp + b: + country: + label: Ukraine + operators: + - label: UZ + points: + - Jagodin (Gr) (Yahodyn, Yagodyn oder Ягодин) + - Medyka (Gr) +- id: pl-sk + a: + country: + id: poland + operators: + - id: pkp + b: + country: + id: slovakia + operators: + - id: zssk + points: + - Lupkow (Gr) +- id: ro-ua + a: + country: + id: romania + operators: + - id: cfr + b: + country: + label: Ukraine + operators: + - label: UZ + points: + - Vicsani (fr) +- id: ro-md + a: + country: + id: romania + operators: + - id: cfr + b: + country: + label: Moldau + operators: + - label: CFM + points: + - Iasi + - Ungheni (fr) +- id: ro-rs + a: + country: + id: romania + operators: + - id: cfr + b: + country: + id: serbia + operators: + - id: sv + points: + - "Jimbolia (fr) (serbisch: Жомбољ)" + - "Vršac (fr) (serbisch: Вршац)" +- id: rs-mk + a: + country: + id: serbia + operators: + - id: sv + b: + country: + label: Nordmazedonien + operators: + - label: ŽRSM + points: + - "Tabanovci (fr) (Serbisch: Табановце; Albanisch: Tabanoc)" +- id: rs-hr + a: + country: + id: serbia + operators: + - id: sv + b: + country: + label: Kroatien + operators: + - label: HŽ + points: + - "Erdut (Gr) (Serbisch: Ердут)" + - "Šid (Gr) (Serbisch: Шид)" +- id: si-hr + a: + country: + id: slovenia + operators: + - id: sz + b: + country: + label: Kroatien + operators: + - label: HŽ + points: + - Buzet (Gr) + - Čakovec (Gr) + - Dobova (Gr) + - Kumrovec (Gr) + - Metlika (Gr) + - Mursko Središće (Gr) + - Rogatec (Gr) + - Šapjane (Gr) +- id: pt-es + a: + country: + id: portugal + operators: + - id: cp + b: + country: + id: spain + operators: + - id: renfe + points: + - Badajoz (fr) + - Barca de Alva (fr) + - Fuentes de Oñoro (fr) + - Valença (fr) + - Valencia de Alcántara (fr) + - V. Real de Sto António Guardiana [> Ayamonte] diff --git a/content/country/borderpoints.en.yaml b/content/country/borderpoints.en.yaml index 78459d6d1..3604a66a7 100644 --- a/content/country/borderpoints.en.yaml +++ b/content/country/borderpoints.en.yaml @@ -1,980 +1,1106 @@ -countries: - austria: - order: [at-cz, at-sk, at-hu-gysev, at-hu-mav, at-si, at-it, at-ch, at-de] - belgium: - order: [be-nl, be-de, be-lu, be-fr] - bosnia-and-herzegovina: - order: [ba-hr, ba-rs] - bulgaria: - order: [bg-ro, bg-tr, bg-gr, bg-rs] - czechia: - order: [cz-pl, cz-sk, at-cz, cz-de] - denmark: - order: [dk-se, dk-de] - france: - order: [fr-eurostar, be-fr, lu-fr, de-fr, fr-ch, fr-it, es-fr] - germany: - order: - [ - dk-de, - de-se, - de-pl, - cz-de, - at-de, - de-bsb, - de-ch, - de-fr, - de-lu, - be-de, - de-eurostar, - de-nl, - ] - footnotes: - - "MS = Middle of the lake" - greece: - order: [gr-mk, bg-gr, gr-tr, gr-it] - footnotes: - - "[>] = In the direction of (e.g. Patras [> Ancona] = Patras is the border - point in the direction of Ancona)" - hungary: - order: - [ - hu-sk-mav, - hu-sk-gysev, - hu-ua, - hu-ro, - hu-rs, - hu-hr, - hu-si, - at-hu-mav, - at-hu-gysev, - ] - ireland: - order: [ie-gb-rail, ie-gb-sll] - italy: - order: [at-it, it-si, gr-it, fr-it, it-ch] - footnotes: - - "[>] = Towards (e.g., Domodossola [> Locarno] = Domodossola is the border - point towards Locarno)" - latvia: - order: [lv-ee, lv-ru, lv-by, lv-lt] - lithuania: - order: [lv-lt, lt-by, lt-pl, lt-ru] - luxembourg: - order: [be-lu, de-lu, lu-fr] - montenegro: - order: [me-rs] - netherlands: - order: [de-nl, be-nl, nl-gb-stl] - norway: - order: [no-se] - poland: - order: [pl-ru, lt-pl, pl-by, pl-ua, pl-sk, cz-pl, de-pl] - portugal: - order: [pt-es] - footnotes: - - "[>] = Direction (for example: V. Real de Sto António Guardiana [> - Ayamonte] = the border point at V. Real de Sto António Guardiana is - oriented towards Ayamonte)" - romania: - order: [ro-ua, ro-md, bg-ro, ro-rs, hu-ro] - serbia: - order: [hu-rs, ro-rs, bg-rs, rs-mk, me-rs, ba-rs, rs-hr] - slovakia: - order: [hu-sk-gysev, hu-sk-mav, cz-sk] - slovenia: - order: [it-si, si-hr, at-si, hu-si] - spain: - order: [pt-es, es-fr] - switzerland: - order: [de-ch, at-ch, it-ch, fr-ch] - footnotes: - - "[>] = Direction (e.g. Locarno [> Domodossola] = Locarno is the border - point towards Domodossola)" - united-kingdom: - order: [nl-gb-stl, gb-eurostar, ie-gb-rail, ie-gb-sll, gb-gb-sll] - -borders: - - id: at-cz - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: czechia } - operators: [{ id: cd }] - points: - - "Bernhardsthal (GR) / Břeclav (Gr)" - - "Unterretzbach (Gr) / Retz (Gr)" - - "Gmünd (Gr) / Česká Skalice (Gr)" - - "Summerau (Gr) / Horní Dvořiště (Gr)" - - - id: at-sk - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: slovakia } - operators: [{ id: zssk }] - points: - - "Marchegg (Gr)" - - "Kittsee (Gr)" - - - id: at-hu-gysev - a: - country: { id: austria } - operators: [{ id: gysev }] - b: - country: { id: hungary } - operators: [{ id: gysev }] - points: - - "Pamhagen (Gr)" - - "Szentgotthárd" - - "Sopron" - - - id: at-hu-mav - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: hungary } - operators: [{ id: mav }] - points: - - "Hegyeshalom (Gr)" - - "Sopron" - - - id: at-si - sort: true - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: slovenia } - operators: [{ id: sz }] - points: - - "Bleiburg (Gr) (Slovenian: Pliberk)" - - "Spielfeld-Strass (Gr) / Spielfeld (Gr) (Slovenian: Špilje)" - - "Rosenbach (Gr) / Jesenice (Gr) (German: Assling)" - - - id: at-it - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: italy } - operators: [{ id: fs }] - points: - - "Brennero/Brenner" - - "San Candido/Innichen" - - "Tarvisio Boscoverde" - - - id: at-ch - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: switzerland } - operators: [{ id: sbb }] - points: - - "Buchs SG" - - "St. Margrethen" - - - id: at-de - sort: true - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: germany } - operators: [{ id: db }] - points: - - "Passau Hbf" - - "Salzburg Hbf (local trains to Salzburg Liefering)" - - "Simbach am Inn" - - "Kufstein" - - "Mittenwald (Gr)" - - "Lindau-Reutin" - - - id: be-nl - a: - country: { id: belgium } - operators: [{ id: sncb }] - b: - country: { id: netherlands } - operators: [{ id: ns }] - points: - - "Roosendaal (fr)" - - "Visé (fr)" - - - id: be-de - a: - country: { id: belgium } - operators: [{ id: sncb }] - b: - country: { id: germany } - operators: [{ id: db }] - points: - - "Aachen Süd (Gr)" - - - id: be-lu - a: - country: { id: belgium } - operators: [{ id: sncb }] - b: - country: { id: luxembourg } - operators: [{ id: cfl }] - points: - - "Athus" - - "Gouvy (fr)" - - "Sterpenich (fr)" - - - id: be-fr - a: - country: { id: belgium } - operators: [{ id: sncb }] - b: - country: { id: france } - operators: [{ id: sncf }] - points: - - "Blandain (fr)" - - "Givet (fr)" - - "Jeumont (fr)" - - "Quévy (fr)" - - "Tourcoing (fr)" - - - id: ba-hr - a: - country: { id: bosnia-and-herzegovina } - operators: [{ id: zfbh }, { id: zrs }] - b: - country: { label: Croatia } - operators: [{ label: HŽ }] - points: - - "Brčko (Gr)" - - "Martin Brod (Gr)" - - "Metković (Gr)" - - "Slavonski Šamac (Gr)" - - "Volinja (Gr)" - - - id: ba-rs - a: - country: { id: bosnia-and-herzegovina } - operators: [{ id: zfbh }, { id: zrs }] - b: - country: { id: serbia } - operators: [{ id: sv }] - points: - - "Zvornik" - - - id: bg-ro - a: - country: { id: bulgaria } - operators: [{ id: bdz }] - b: - country: { id: romania } - operators: [{ id: cfr }] - points: - - "Ruse (fr) (Bulgarian: Русе)" - - "Vidin (fr)" - - - id: bg-tr - a: - country: { id: bulgaria } - operators: [{ id: bdz }] - b: - country: { label: Turkey } - operators: [{ label: TCDD }] - points: - - "Kapikule (fr)" - - - id: bg-gr - a: - country: { id: bulgaria } - operators: [{ id: bdz }] - b: - country: { id: greece } - operators: [{ id: ht }] - points: - - "Kulata (fr) (Bulgarian: Кулата)" - - "Svilengrad (fr) (Bulgarian: Свиленград)" - - - id: bg-rs - a: - country: { id: bulgaria } - operators: [{ id: bdz }] - b: - country: { id: serbia } - operators: [{ id: sv }] - points: - - "Dimitrovgrad (fr) (Bulgarian: Цариброд, Tsaribrod)" - - - id: cz-pl - a: - country: { id: czechia } - operators: [{ id: cd }] - b: - country: { id: poland } - operators: [{ id: pkp }, { id: kd }, { id: ks }] - points: - - "Bohumín (Gr)" - - "Český Těšín (Gr)" - - "Głuchołlazy (Gr) (Czech: Hlucholazy)" - - "Harrachov (Gr)" - - "Lichkov (Gr) (Plhy City)" - - "Zebrzydowice (Gr)" - - "Schlesische Woiwodschaft (Silesian Voivodeship)" - - - id: cz-sk - a: - country: { id: czechia } - operators: [{ id: cd }] - b: - country: { id: slovakia } - operators: [{ id: zssk }] - points: - - "Čadca (Gr)" - - "Hodonín (Gr)" - - "Horní Lideč (Gr)" - - "Kúty (Gr)" - - "Myjava (Gr)" - - "Nemšová (Gr)" - - "Skalica na Slovensku (Gr)" - - - id: cz-de - sort: true - a: - country: { id: czechia } - operators: [{ id: cd }] - b: - country: { id: germany } - operators: [{ id: db }] - points: - - "Selb-Plößberg(Gr) / Aš (Gr)" - - "Bayerisch Eisenstein (Czech: Bavorská Železná ruda)" - - "Cheb (Gr)" - - "Sebnitz (Gr) / Dolní Poustevna (Gr)" - - "Furth i Wald (Gr)" - - "Zittau (Gr)" - - "Potucky (ČD)" - - "Schöna (Gr)" - - "Rumburk (Gr)" - - "Vejprty (Gr)" - - "Vojtanov (Gr)" - - "Kraslice (Gr)" - - "Waidhaus (Gr)" - - - id: dk-se - a: - country: { id: denmark } - operators: [{ id: dsb }] - b: - country: { label: Sweden } - operators: [{ label: SJ }] - points: - - "Helsingborg (via Helsingør)" - - - id: dk-de - a: - country: { id: denmark } - operators: [{ id: dsb }] - b: - country: { id: germany } - operators: [{ id: db }] - points: - - "Flensburg (Gr)" - - "Puttgarden (MS) (via Rødby Faerge)" - - "Tønder (Gr)" - - "Warnemünde (via Gedser)" - - - id: de-se - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { label: Sweden } - operators: [{ label: SJ }] - points: - - "Lübeck-Travemünde Hafen" - - "Lübeck-Travemünde Skandinavienkai" - - "Sassnitz (Gr)" - - - id: de-pl - sort: true - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { id: poland } - operators: [{ id: pkp }] - points: - - "Ahlbeck (Gr)" - - "Forst (Gr)" - - "Frankfurt(Oder) (Gr)" - - "Grambow (Gr)" - - "Gubin (Gr)" - - "Horka (Gr)" - - "Kostrzyn (Gr)" - - "Tantow (Gr)" - - "Zgorzelec (Gr)" - - - id: de-bsb - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: null - operators: [{ id: bsb }] - points: - - "Friedrichshafen" - - "Langenargen" - - "Lindau" - - "Konstanz" - - "Radolfzell" - - "Schaffhausen" - - "Überlingen" - - - id: de-ch - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { id: switzerland } - operators: [{ id: sbb }, { id: bls }, { id: sp }] - points: - - "Basel Bad Bf" - - "Konstanz" - - "Schaffhausen" - - "Waldshut" - - - id: de-fr - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { id: france } - operators: [{ id: sncf }] - points: - - "Apach (fr)" - - "Forbach (fr)" - - "Hanweiler (Gr)" - - "Kehl (Gr)" - - "Lauterbourg (fr)" - - "Neuenburg (Bd) (Gr)" - - "Wissembourg (fr)" - - - id: de-lu - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { id: luxembourg } - operators: [{ id: cfl }] - points: - - "Igel (Gr)" - - - id: de-eurostar - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: null - operators: [{ id: eurostar }] - points: - - "Aachen" - - "Duisburg" - - "Düsseldorf" - - "Düsseldorf Airport" - - "Essen" - - "Cologne" - - - id: de-nl - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { id: netherlands } - operators: [{ id: ns }] - points: - - "Bad Bentheim (Gr)" - - "Emmerich (Gr)" - - "Gronau (Westf) (Gr)" - - "Herzogenrath (Gr)" - - "Venlo (Gr)" - - "Weener (Gr)" - - - id: gr-mk - a: - country: { id: greece } - operators: [{ id: ht }] - b: - country: { label: North Macedonia } - operators: [{ label: ŽRSM }] - points: - - "Gevgelija (fr)" - - - id: gr-tr - a: - country: { id: greece } - operators: [{ id: ht }] - b: - country: { label: Turkey } - operators: [{ label: TCDD }] - points: - - "Pythio (Πύθιο)" - - - id: gr-it - a: - country: { id: greece } - operators: [{ id: attica }] - b: - country: { id: italy } - operators: [{ id: attica }] - points: - - "Patras (Πάτρα) [>Ancona, >Bari]" - - "Ancona [>Igoumenitsa, >Patras]" - - "Bari [>Igoumenitsa, >Patras]" - - - id: hu-sk-mav - a: - country: { id: hungary } - operators: [{ id: mav }] - b: - country: { id: slovakia } - operators: [{ id: zssk }] - points: - - "Bánréve (Gr)" - - "Čaňa (Gr)" - - "Fiľakovo (Gr)" - - "Komárom (Gr)" - - "Sátoraljaújhely (Gr)" - - "Szob (Gr)" - - - id: hu-sk-gysev - a: - country: { id: hungary } - operators: [{ id: gysev }] - b: - country: { id: slovakia } - operators: [{ id: gysev }] - points: - - "Rajka (Gr)" - - - id: hu-ua - a: - country: { id: hungary } - operators: [{ id: mav }] - b: - country: { label: Ukraine } - operators: [{ label: UZ }] - points: - - "Záhony (Gr)" - - - id: hu-ro - a: - country: { id: hungary } - operators: [{ id: mav }] - b: - country: { id: romania } - operators: [{ id: cfr }] - points: - - "Biharkeresztes (fr)" - - "Curtici (fr) (Hungarian: Kürtös)" - - "Nyirábrány (fr)" - - "Salonta (fr) (Hungarian: Nagyszalonta, Szalonta)" - - - id: hu-rs - a: - country: { id: hungary } - operators: [{ id: mav }] - b: - country: { id: serbia } - operators: [{ id: sv }] - points: - - "Röszke (Gr)" - - "Subotica (Gr)" - - - id: hu-hr - a: - country: { id: hungary } - operators: [{ id: mav }] - b: - country: { label: Croatia } - operators: [{ label: HŽ }] - points: - - "Koprivnica (Gr)" - - "Kotoriba (Gr)" - - "Magyarbóly (Gr)" - - - id: hu-si - a: - country: { id: hungary } - operators: [{ id: mav }, { id: gysev }] - b: - country: { id: slovenia } - operators: [{ id: sz }] - points: - - "Hodoš (Gr) (Őrihodos)" - - - id: ie-gb-rail - a: - country: { id: ireland } - operators: [{ id: cie }] - b: - country: { id: united-kingdom } - operators: [{ id: nir }] - points: - - "Dundalk" - - - id: ie-gb-sll - a: - country: { id: ireland } - operators: [{ id: sll }] - b: - country: { id: united-kingdom } - operators: [{ id: sll }] - points: - - "Dublin Bay / Holyhead" - - "Rosslare / Fishguard" - - - id: it-si - a: - country: { id: italy } - operators: [{ id: fs }] - b: - country: { id: slovenia } - operators: [{ id: sz }] - points: - - "Nova Gorica (fr)" - - "Villa Opicina (fr) (Slovenian: Opčine, Triestine: Opcina)" - - - id: fr-it - a: - country: { id: france } - operators: [{ id: sncf }] - b: - country: { id: italy } - operators: [{ id: fs }] - points: - - "Limone-Confine" - - "Modane (fr)" - - "Piene (fr)" - - "Ventimiglia (fr)" - - - id: it-ch - sort: true - a: - country: { id: italy } - operators: [{ id: fs }] - b: - country: { id: switzerland } - operators: [{ id: sbb }, { id: bls }, { id: sp }] - points: - - "Chiasso" - - "Domodossola" - - "Iselle transito [> Brig]" - - "Iselle di Trasquera [> Domodossola]" - - "Domodossola [> Locarno]" - - "Locarno [> Domodossola]" - - "Porto Ceresio [> Lugano]" - - "Lugano [> Porto Ceresio]" - - "Pino transito" - - "Tirano" - - - id: fr-ch - a: - country: { id: france } - operators: [{ id: sncf }] - b: - country: { id: switzerland } - operators: [{ id: sbb }, { id: bls }, { id: sp }] - points: - - "Annemasse" - - "Basel SBB" - - "Delle (fr)" - - "Genève [> Bellegarde]" - - "Le Châtelard-Frontière (fr)" - - "Le Locle-Col-des-Roches" - - "Les Verrières (fr)" - - "Vallorbe" - - - id: lu-fr - a: - country: { id: luxembourg } - operators: [{ id: cfl }] - b: - country: { id: france } - operators: [{ id: sncf }] - points: - - "Bettembourg (fr)" - - "Rodange (fr)" - - - id: es-fr - a: - country: { id: spain } - operators: [{ id: renfe }] - b: - country: { id: france } - operators: [{ id: sncf }] - points: - - "Canfranc (fr)" - - "Hendaye (fr)" - - "Port Bou (fr)" - - "La Tour-de-Carol-Enveitg" - - - id: fr-eurostar - a: - country: { id: france } - operators: [{ id: sncf }] - b: - country: null - operators: [{ id: eurostar }] - points: - - "Paris" - - "Lille" - - - id: gb-eurostar - a: - country: { id: united-kingdom } - operators: [{ id: gb }] - b: - country: { id: france } - operators: [{ id: eurostar }] - points: - - "London St. Pancras International" - - - id: nl-gb-stl - a: - country: { id: netherlands } - operators: [{ id: stl }] - b: - country: { id: united-kingdom } - operators: [{ id: stl }] - points: - - "Hoek van Holland / Harwich P.Q." - - - id: gb-gb-sll - a: - country: { id: united-kingdom } - operators: [{ id: sll }] - b: - country: { id: united-kingdom } - operators: [{ id: sll }] - points: - - "Cairnryan" - - "Liverpool" - - "Belfast" - - - id: lv-ee - a: - country: { id: latvia } - operators: [{ label: LDz }] - b: - country: { label: Estonia } - points: - - "Valga" - - - id: lv-ru - a: - country: { id: latvia } - operators: [{ label: LDz }] - b: - country: { label: Russia } - points: - - "Border closed" - - - id: lv-by - a: - country: { id: latvia } - operators: [{ label: LDz }] - b: - country: { label: Belarus } - points: - - "Border closed" - - - id: lv-lt - a: - country: { id: latvia } - operators: [{ label: LDz }] - b: - country: { id: lithuania } - operators: [{ id: ltg }] - points: - - "Joniškis" - - - id: lt-by - a: - country: { id: lithuania } - operators: [{ id: ltg }] - b: - country: { label: Belarus } - points: - - "Border closed" - - - id: lt-pl - a: - country: { id: lithuania } - operators: [{ id: ltg }] - b: - country: { id: poland } - operators: [{ id: pkp }] - points: - - "Mockava (Gr)" - - - id: lt-ru - a: - country: { id: lithuania } - operators: [{ id: ltg }] - b: - country: { label: Russia } - points: - - "No boarding/alighting in transit traffic Russia-Belarus-Lithuania-Kaliningrad" - - - id: me-rs - a: - country: { id: montenegro } - operators: [{ id: zpcg }] - b: - country: { id: serbia } - operators: [{ id: sv }] - points: - - "Bijelo Polje (Gr)" - - - id: no-se - a: - country: { id: norway } - operators: [{ id: vy }] - b: - country: { label: Sweden } - operators: [{ label: SJ }] - points: - - "Bjørnfjell (Gr)" - - "Halden (Kornsjø (Gr))" - - "Kongsvinger (Charlottenberg (Gr))" - - "Storlien" - - - id: pl-ru - a: - country: { id: poland } - operators: [{ id: pkp }] - b: - country: { label: Russia } - operators: [{ label: RZD }] - points: - - "Braniewo (Gr)" - - - id: pl-by - a: - country: { id: poland } - operators: [{ id: pkp }] - b: - country: { label: Belarus } - operators: [{ label: BC }] - points: - - "Brest (Gr) (Брэст)" - - "Bruzgi / Bruzhi (Gr)" - - "Czeremcha (Gr) (Podlaskie Voivodeship)" - - - id: pl-ua - a: - country: { id: poland } - operators: [{ id: pkp }] - b: - country: { label: Ukraine } - operators: [{ label: UZ }] - points: - - "Jagodin (Gr) (Yahodyn, Yagodyn or Ягодин)" - - "Medyka (Gr)" - - - id: pl-sk - a: - country: { id: poland } - operators: [{ id: pkp }] - b: - country: { id: slovakia } - operators: [{ id: zssk }] - points: - - "Lupkow (Gr)" - - - id: ro-ua - a: - country: { id: romania } - operators: [{ id: cfr }] - b: - country: { label: Ukraine } - operators: [{ label: UZ }] - points: - - "Vicsani (fr)" - - - id: ro-md - a: - country: { id: romania } - operators: [{ id: cfr }] - b: - country: { label: Moldova } - operators: [{ label: CFM }] - points: - - "Iasi" - - "Ungheni (fr)" - - - id: ro-rs - a: - country: { id: romania } - operators: [{ id: cfr }] - b: - country: { id: serbia } - operators: [{ id: sv }] - points: - - "Jimbolia (fr) (Serbian: Жомбољ)" - - "Vršac (fr) (Serbian: Вршац)" - - - id: rs-mk - a: - country: { id: serbia } - operators: [{ id: sv }] - b: - country: { label: North Macedonia } - operators: [{ label: ŽRSM }] - points: - - "Tabanovci (fr) (Serbian: Табановце; Albanian: Tabanoc)" - - - id: rs-hr - a: - country: { id: serbia } - operators: [{ id: sv }] - b: - country: { label: Croatia } - operators: [{ label: HŽ }] - points: - - "Erdut (Gr) (Serbian: Ердут)" - - "Šid (Gr) (Serbian: Шид)" - - - id: si-hr - a: - country: { id: slovenia } - operators: [{ id: sz }] - b: - country: { label: Croatia } - operators: [{ label: HŽ }] - points: - - "Buzet (Gr)" - - "Čakovec (Gr)" - - "Dobova (Gr)" - - "Kumrovec (Gr)" - - "Metlika (Gr)" - - "Mursko Središće (Gr)" - - "Rogatec (Gr)" - - "Šapjane (Gr)" - - - id: pt-es - a: - country: { id: portugal } - operators: [{ id: cp }] - b: - country: { id: spain } - operators: [{ id: renfe }] - points: - - "Badajoz (fr)" - - "Barca de Alva (fr)" - - "Fuentes de Oñoro (fr)" - - "Valença (fr)" - - "Valencia de Alcántara (fr)" - - "V. Real de Sto António Guardiana [> Ayamonte]" +- id: at-cz + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: czechia + operators: + - id: cd + points: + - Bernhardsthal (GR) / Břeclav (Gr) + - Unterretzbach (Gr) / Retz (Gr) + - Gmünd (Gr) / Česká Skalice (Gr) + - Summerau (Gr) / Horní Dvořiště (Gr) +- id: at-sk + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: slovakia + operators: + - id: zssk + points: + - Marchegg (Gr) + - Kittsee (Gr) +- id: at-hu-gysev + a: + country: + id: austria + operators: + - id: gysev + b: + country: + id: hungary + operators: + - id: gysev + points: + - Pamhagen (Gr) + - Szentgotthárd + - Sopron +- id: at-hu-mav + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: hungary + operators: + - id: mav + points: + - Hegyeshalom (Gr) + - Sopron +- id: at-si + sort: true + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: slovenia + operators: + - id: sz + points: + - "Bleiburg (Gr) (Slovenian: Pliberk)" + - "Spielfeld-Strass (Gr) / Spielfeld (Gr) (Slovenian: Špilje)" + - "Rosenbach (Gr) / Jesenice (Gr) (German: Assling)" +- id: at-it + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: italy + operators: + - id: fs + points: + - Brennero/Brenner + - San Candido/Innichen + - Tarvisio Boscoverde +- id: at-ch + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: switzerland + operators: + - id: sbb + points: + - Buchs SG + - St. Margrethen +- id: at-de + sort: true + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: germany + operators: + - id: db + points: + - Passau Hbf + - Salzburg Hbf (local trains to Salzburg Liefering) + - Simbach am Inn + - Kufstein + - Mittenwald (Gr) + - Lindau-Reutin +- id: be-nl + a: + country: + id: belgium + operators: + - id: sncb + b: + country: + id: netherlands + operators: + - id: ns + points: + - Roosendaal (fr) + - Visé (fr) +- id: be-de + a: + country: + id: belgium + operators: + - id: sncb + b: + country: + id: germany + operators: + - id: db + points: + - Aachen Süd (Gr) +- id: be-lu + a: + country: + id: belgium + operators: + - id: sncb + b: + country: + id: luxembourg + operators: + - id: cfl + points: + - Athus + - Gouvy (fr) + - Sterpenich (fr) +- id: be-fr + a: + country: + id: belgium + operators: + - id: sncb + b: + country: + id: france + operators: + - id: sncf + points: + - Blandain (fr) + - Givet (fr) + - Jeumont (fr) + - Quévy (fr) + - Tourcoing (fr) +- id: ba-hr + a: + country: + id: bosnia-and-herzegovina + operators: + - id: zfbh + - id: zrs + b: + country: + label: Croatia + operators: + - label: HŽ + points: + - Brčko (Gr) + - Martin Brod (Gr) + - Metković (Gr) + - Slavonski Šamac (Gr) + - Volinja (Gr) +- id: ba-rs + a: + country: + id: bosnia-and-herzegovina + operators: + - id: zfbh + - id: zrs + b: + country: + id: serbia + operators: + - id: sv + points: + - Zvornik +- id: bg-ro + a: + country: + id: bulgaria + operators: + - id: bdz + b: + country: + id: romania + operators: + - id: cfr + points: + - "Ruse (fr) (Bulgarian: Русе)" + - Vidin (fr) +- id: bg-tr + a: + country: + id: bulgaria + operators: + - id: bdz + b: + country: + label: Turkey + operators: + - label: TCDD + points: + - Kapikule (fr) +- id: bg-gr + a: + country: + id: bulgaria + operators: + - id: bdz + b: + country: + id: greece + operators: + - id: ht + points: + - "Kulata (fr) (Bulgarian: Кулата)" + - "Svilengrad (fr) (Bulgarian: Свиленград)" +- id: bg-rs + a: + country: + id: bulgaria + operators: + - id: bdz + b: + country: + id: serbia + operators: + - id: sv + points: + - "Dimitrovgrad (fr) (Bulgarian: Цариброд, Tsaribrod)" +- id: cz-pl + a: + country: + id: czechia + operators: + - id: cd + b: + country: + id: poland + operators: + - id: pkp + - id: kd + - id: ks + points: + - Bohumín (Gr) + - Český Těšín (Gr) + - "Głuchołlazy (Gr) (Czech: Hlucholazy)" + - Harrachov (Gr) + - Lichkov (Gr) (Plhy City) + - Zebrzydowice (Gr) + - Schlesische Woiwodschaft (Silesian Voivodeship) +- id: cz-sk + a: + country: + id: czechia + operators: + - id: cd + b: + country: + id: slovakia + operators: + - id: zssk + points: + - Čadca (Gr) + - Hodonín (Gr) + - Horní Lideč (Gr) + - Kúty (Gr) + - Myjava (Gr) + - Nemšová (Gr) + - Skalica na Slovensku (Gr) +- id: cz-de + sort: true + a: + country: + id: czechia + operators: + - id: cd + b: + country: + id: germany + operators: + - id: db + points: + - Selb-Plößberg(Gr) / Aš (Gr) + - "Bayerisch Eisenstein (Czech: Bavorská Železná ruda)" + - Cheb (Gr) + - Sebnitz (Gr) / Dolní Poustevna (Gr) + - Furth i Wald (Gr) + - Zittau (Gr) + - Potucky (ČD) + - Schöna (Gr) + - Rumburk (Gr) + - Vejprty (Gr) + - Vojtanov (Gr) + - Kraslice (Gr) + - Waidhaus (Gr) +- id: dk-se + a: + country: + id: denmark + operators: + - id: dsb + b: + country: + label: Sweden + operators: + - label: SJ + points: + - Helsingborg (via Helsingør) +- id: dk-de + a: + country: + id: denmark + operators: + - id: dsb + b: + country: + id: germany + operators: + - id: db + points: + - Flensburg (Gr) + - Puttgarden (MS) (via Rødby Faerge) + - Tønder (Gr) + - Warnemünde (via Gedser) +- id: de-se + a: + country: + id: germany + operators: + - id: db + b: + country: + label: Sweden + operators: + - label: SJ + points: + - Lübeck-Travemünde Hafen + - Lübeck-Travemünde Skandinavienkai + - Sassnitz (Gr) +- id: de-pl + sort: true + a: + country: + id: germany + operators: + - id: db + b: + country: + id: poland + operators: + - id: pkp + points: + - Ahlbeck (Gr) + - Forst (Gr) + - Frankfurt(Oder) (Gr) + - Grambow (Gr) + - Gubin (Gr) + - Horka (Gr) + - Kostrzyn (Gr) + - Tantow (Gr) + - Zgorzelec (Gr) +- id: de-bsb + a: + country: + id: germany + operators: + - id: db + b: + country: + operators: + - id: bsb + points: + - Friedrichshafen + - Langenargen + - Lindau + - Konstanz + - Radolfzell + - Schaffhausen + - Überlingen +- id: de-ch + a: + country: + id: germany + operators: + - id: db + b: + country: + id: switzerland + operators: + - id: sbb + - id: bls + - id: sp + points: + - Basel Bad Bf + - Konstanz + - Schaffhausen + - Waldshut +- id: de-fr + a: + country: + id: germany + operators: + - id: db + b: + country: + id: france + operators: + - id: sncf + points: + - Apach (fr) + - Forbach (fr) + - Hanweiler (Gr) + - Kehl (Gr) + - Lauterbourg (fr) + - Neuenburg (Bd) (Gr) + - Wissembourg (fr) +- id: de-lu + a: + country: + id: germany + operators: + - id: db + b: + country: + id: luxembourg + operators: + - id: cfl + points: + - Igel (Gr) +- id: de-eurostar + a: + country: + id: germany + operators: + - id: db + b: + country: + operators: + - id: eurostar + points: + - Aachen + - Duisburg + - Düsseldorf + - Düsseldorf Airport + - Essen + - Cologne +- id: de-nl + a: + country: + id: germany + operators: + - id: db + b: + country: + id: netherlands + operators: + - id: ns + points: + - Bad Bentheim (Gr) + - Emmerich (Gr) + - Gronau (Westf) (Gr) + - Herzogenrath (Gr) + - Venlo (Gr) + - Weener (Gr) +- id: gr-mk + a: + country: + id: greece + operators: + - id: ht + b: + country: + label: North Macedonia + operators: + - label: ŽRSM + points: + - Gevgelija (fr) +- id: gr-tr + a: + country: + id: greece + operators: + - id: ht + b: + country: + label: Turkey + operators: + - label: TCDD + points: + - Pythio (Πύθιο) +- id: gr-it + a: + country: + id: greece + operators: + - id: attica + b: + country: + id: italy + operators: + - id: attica + points: + - Patras (Πάτρα) [>Ancona, >Bari] + - Ancona [>Igoumenitsa, >Patras] + - Bari [>Igoumenitsa, >Patras] +- id: hu-sk-mav + a: + country: + id: hungary + operators: + - id: mav + b: + country: + id: slovakia + operators: + - id: zssk + points: + - Bánréve (Gr) + - Čaňa (Gr) + - Fiľakovo (Gr) + - Komárom (Gr) + - Sátoraljaújhely (Gr) + - Szob (Gr) +- id: hu-sk-gysev + a: + country: + id: hungary + operators: + - id: gysev + b: + country: + id: slovakia + operators: + - id: gysev + points: + - Rajka (Gr) +- id: hu-ua + a: + country: + id: hungary + operators: + - id: mav + b: + country: + label: Ukraine + operators: + - label: UZ + points: + - Záhony (Gr) +- id: hu-ro + a: + country: + id: hungary + operators: + - id: mav + b: + country: + id: romania + operators: + - id: cfr + points: + - Biharkeresztes (fr) + - "Curtici (fr) (Hungarian: Kürtös)" + - Nyirábrány (fr) + - "Salonta (fr) (Hungarian: Nagyszalonta, Szalonta)" +- id: hu-rs + a: + country: + id: hungary + operators: + - id: mav + b: + country: + id: serbia + operators: + - id: sv + points: + - Röszke (Gr) + - Subotica (Gr) +- id: hu-hr + a: + country: + id: hungary + operators: + - id: mav + b: + country: + label: Croatia + operators: + - label: HŽ + points: + - Koprivnica (Gr) + - Kotoriba (Gr) + - Magyarbóly (Gr) +- id: hu-si + a: + country: + id: hungary + operators: + - id: mav + - id: gysev + b: + country: + id: slovenia + operators: + - id: sz + points: + - Hodoš (Gr) (Őrihodos) +- id: ie-gb-rail + a: + country: + id: ireland + operators: + - id: cie + b: + country: + id: united-kingdom + operators: + - id: nir + points: + - Dundalk +- id: ie-gb-sll + a: + country: + id: ireland + operators: + - id: sll + b: + country: + id: united-kingdom + operators: + - id: sll + points: + - Dublin Bay / Holyhead + - Rosslare / Fishguard +- id: it-si + a: + country: + id: italy + operators: + - id: fs + b: + country: + id: slovenia + operators: + - id: sz + points: + - Nova Gorica (fr) + - "Villa Opicina (fr) (Slovenian: Opčine, Triestine: Opcina)" +- id: fr-it + a: + country: + id: france + operators: + - id: sncf + b: + country: + id: italy + operators: + - id: fs + points: + - Limone-Confine + - Modane (fr) + - Piene (fr) + - Ventimiglia (fr) +- id: it-ch + sort: true + a: + country: + id: italy + operators: + - id: fs + b: + country: + id: switzerland + operators: + - id: sbb + - id: bls + - id: sp + points: + - Chiasso + - Domodossola + - Iselle transito [> Brig] + - Iselle di Trasquera [> Domodossola] + - Domodossola [> Locarno] + - Locarno [> Domodossola] + - Porto Ceresio [> Lugano] + - Lugano [> Porto Ceresio] + - Pino transito + - Tirano +- id: fr-ch + a: + country: + id: france + operators: + - id: sncf + b: + country: + id: switzerland + operators: + - id: sbb + - id: bls + - id: sp + points: + - Annemasse + - Basel SBB + - Delle (fr) + - Genève [> Bellegarde] + - Le Châtelard-Frontière (fr) + - Le Locle-Col-des-Roches + - Les Verrières (fr) + - Vallorbe +- id: lu-fr + a: + country: + id: luxembourg + operators: + - id: cfl + b: + country: + id: france + operators: + - id: sncf + points: + - Bettembourg (fr) + - Rodange (fr) +- id: es-fr + a: + country: + id: spain + operators: + - id: renfe + b: + country: + id: france + operators: + - id: sncf + points: + - Canfranc (fr) + - Hendaye (fr) + - Port Bou (fr) + - La Tour-de-Carol-Enveitg +- id: fr-eurostar + a: + country: + id: france + operators: + - id: sncf + b: + country: + operators: + - id: eurostar + points: + - Paris + - Lille +- id: gb-eurostar + a: + country: + id: united-kingdom + operators: + - id: gb + b: + country: + id: france + operators: + - id: eurostar + points: + - London St. Pancras International +- id: nl-gb-stl + a: + country: + id: netherlands + operators: + - id: stl + b: + country: + id: united-kingdom + operators: + - id: stl + points: + - Hoek van Holland / Harwich P.Q. +- id: gb-gb-sll + a: + country: + id: united-kingdom + operators: + - id: sll + b: + country: + id: united-kingdom + operators: + - id: sll + points: + - Cairnryan + - Liverpool + - Belfast +- id: lv-ee + a: + country: + id: latvia + operators: + - label: LDz + b: + country: + label: Estonia + points: + - Valga +- id: lv-ru + a: + country: + id: latvia + operators: + - label: LDz + b: + country: + label: Russia + points: + - Border closed +- id: lv-by + a: + country: + id: latvia + operators: + - label: LDz + b: + country: + label: Belarus + points: + - Border closed +- id: lv-lt + a: + country: + id: latvia + operators: + - label: LDz + b: + country: + id: lithuania + operators: + - id: ltg + points: + - Joniškis +- id: lt-by + a: + country: + id: lithuania + operators: + - id: ltg + b: + country: + label: Belarus + points: + - Border closed +- id: lt-pl + a: + country: + id: lithuania + operators: + - id: ltg + b: + country: + id: poland + operators: + - id: pkp + points: + - Mockava (Gr) +- id: lt-ru + a: + country: + id: lithuania + operators: + - id: ltg + b: + country: + label: Russia + points: + - No boarding/alighting in transit traffic Russia-Belarus-Lithuania-Kaliningrad +- id: me-rs + a: + country: + id: montenegro + operators: + - id: zpcg + b: + country: + id: serbia + operators: + - id: sv + points: + - Bijelo Polje (Gr) +- id: no-se + a: + country: + id: norway + operators: + - id: vy + b: + country: + label: Sweden + operators: + - label: SJ + points: + - Bjørnfjell (Gr) + - Halden (Kornsjø (Gr)) + - Kongsvinger (Charlottenberg (Gr)) + - Storlien +- id: pl-ru + a: + country: + id: poland + operators: + - id: pkp + b: + country: + label: Russia + operators: + - label: RZD + points: + - Braniewo (Gr) +- id: pl-by + a: + country: + id: poland + operators: + - id: pkp + b: + country: + label: Belarus + operators: + - label: BC + points: + - Brest (Gr) (Брэст) + - Bruzgi / Bruzhi (Gr) + - Czeremcha (Gr) (Podlaskie Voivodeship) +- id: pl-ua + a: + country: + id: poland + operators: + - id: pkp + b: + country: + label: Ukraine + operators: + - label: UZ + points: + - Jagodin (Gr) (Yahodyn, Yagodyn or Ягодин) + - Medyka (Gr) +- id: pl-sk + a: + country: + id: poland + operators: + - id: pkp + b: + country: + id: slovakia + operators: + - id: zssk + points: + - Lupkow (Gr) +- id: ro-ua + a: + country: + id: romania + operators: + - id: cfr + b: + country: + label: Ukraine + operators: + - label: UZ + points: + - Vicsani (fr) +- id: ro-md + a: + country: + id: romania + operators: + - id: cfr + b: + country: + label: Moldova + operators: + - label: CFM + points: + - Iasi + - Ungheni (fr) +- id: ro-rs + a: + country: + id: romania + operators: + - id: cfr + b: + country: + id: serbia + operators: + - id: sv + points: + - "Jimbolia (fr) (Serbian: Жомбољ)" + - "Vršac (fr) (Serbian: Вршац)" +- id: rs-mk + a: + country: + id: serbia + operators: + - id: sv + b: + country: + label: North Macedonia + operators: + - label: ŽRSM + points: + - "Tabanovci (fr) (Serbian: Табановце; Albanian: Tabanoc)" +- id: rs-hr + a: + country: + id: serbia + operators: + - id: sv + b: + country: + label: Croatia + operators: + - label: HŽ + points: + - "Erdut (Gr) (Serbian: Ердут)" + - "Šid (Gr) (Serbian: Шид)" +- id: si-hr + a: + country: + id: slovenia + operators: + - id: sz + b: + country: + label: Croatia + operators: + - label: HŽ + points: + - Buzet (Gr) + - Čakovec (Gr) + - Dobova (Gr) + - Kumrovec (Gr) + - Metlika (Gr) + - Mursko Središće (Gr) + - Rogatec (Gr) + - Šapjane (Gr) +- id: pt-es + a: + country: + id: portugal + operators: + - id: cp + b: + country: + id: spain + operators: + - id: renfe + points: + - Badajoz (fr) + - Barca de Alva (fr) + - Fuentes de Oñoro (fr) + - Valença (fr) + - Valencia de Alcántara (fr) + - V. Real de Sto António Guardiana [> Ayamonte] diff --git a/content/country/borderpoints.fr.yaml b/content/country/borderpoints.fr.yaml index 77768c920..062c4850e 100644 --- a/content/country/borderpoints.fr.yaml +++ b/content/country/borderpoints.fr.yaml @@ -1,980 +1,1106 @@ -countries: - austria: - order: [at-cz, at-sk, at-hu-gysev, at-hu-mav, at-si, at-it, at-ch, at-de] - belgium: - order: [be-nl, be-de, be-lu, be-fr] - bosnia-and-herzegovina: - order: [ba-hr, ba-rs] - bulgaria: - order: [bg-ro, bg-tr, bg-gr, bg-rs] - czechia: - order: [cz-pl, cz-sk, at-cz, cz-de] - denmark: - order: [dk-se, dk-de] - france: - order: [fr-eurostar, be-fr, lu-fr, de-fr, fr-ch, fr-it, es-fr] - germany: - order: - [ - dk-de, - de-se, - de-pl, - cz-de, - at-de, - de-bsb, - de-ch, - de-fr, - de-lu, - be-de, - de-eurostar, - de-nl, - ] - footnotes: - - "MS = Milieu du lac" - greece: - order: [gr-mk, bg-gr, gr-tr, gr-it] - footnotes: - - "[>] = En direction de (par ex. Patras [> Ancona] = Patras est le point - frontière en direction d’Ancona)" - hungary: - order: - [ - hu-sk-mav, - hu-sk-gysev, - hu-ua, - hu-ro, - hu-rs, - hu-hr, - hu-si, - at-hu-mav, - at-hu-gysev, - ] - ireland: - order: [ie-gb-rail, ie-gb-sll] - italy: - order: [at-it, it-si, gr-it, fr-it, it-ch] - footnotes: - - "[>] = Vers (par exemple, Domodossola [> Locarno] = Domodossola est le - point frontière vers Locarno)" - latvia: - order: [lv-ee, lv-ru, lv-by, lv-lt] - lithuania: - order: [lv-lt, lt-by, lt-pl, lt-ru] - luxembourg: - order: [be-lu, de-lu, lu-fr] - montenegro: - order: [me-rs] - netherlands: - order: [de-nl, be-nl, nl-gb-stl] - norway: - order: [no-se] - poland: - order: [pl-ru, lt-pl, pl-by, pl-ua, pl-sk, cz-pl, de-pl] - portugal: - order: [pt-es] - footnotes: - - "[>] = Direction (par exemple : V. Real de Sto António Guardiana [> - Ayamonte] = le point frontalier à V. Real de Sto António Guardiana est - orienté vers Ayamonte)" - romania: - order: [ro-ua, ro-md, bg-ro, ro-rs, hu-ro] - serbia: - order: [hu-rs, ro-rs, bg-rs, rs-mk, me-rs, ba-rs, rs-hr] - slovakia: - order: [hu-sk-gysev, hu-sk-mav, cz-sk] - slovenia: - order: [it-si, si-hr, at-si, hu-si] - spain: - order: [pt-es, es-fr] - switzerland: - order: [de-ch, at-ch, it-ch, fr-ch] - footnotes: - - "[>] = En direction de (par exemple, Locarno [> Domodossola] = Locarno - est le point frontière en direction de Domodossola)" - united-kingdom: - order: [nl-gb-stl, gb-eurostar, ie-gb-rail, ie-gb-sll, gb-gb-sll] - -borders: - - id: at-cz - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: czechia } - operators: [{ id: cd }] - points: - - "Bernhardsthal (Gr) / Břeclav (Gr)" - - "Unterretzbach (Gr) / Retz (Gr)" - - "Gmünd (Gr) / Česká Skalice (Gr)" - - "Summerau (Gr) / Horní Dvořiště (Gr)" - - - id: at-sk - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: slovakia } - operators: [{ id: zssk }] - points: - - "Marchegg (Gr)" - - "Kittsee (Gr)" - - - id: at-hu-gysev - a: - country: { id: austria } - operators: [{ id: gysev }] - b: - country: { id: hungary } - operators: [{ id: gysev }] - points: - - "Pamhagen (Gr)" - - "Szentgotthárd" - - "Sopron" - - - id: at-hu-mav - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: hungary } - operators: [{ id: mav }] - points: - - "Hegyeshalom (Gr)" - - "Sopron" - - - id: at-si - sort: true - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: slovenia } - operators: [{ id: sz }] - points: - - "Bleiburg (Gr) (slovène : Pliberk)" - - "Spielfeld-Strass (Gr) / Spielfeld (Gr) (slovène : Špilje)" - - "Rosenbach (Gr) / Jesenice (Gr) (allemand : Assling)" - - - id: at-it - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: italy } - operators: [{ id: fs }] - points: - - "Brennero/Brenner" - - "San Candido/Innichen" - - "Tarvisio Boscoverde" - - - id: at-ch - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: switzerland } - operators: [{ id: sbb }] - points: - - "Buchs SG" - - "St. Margrethen" - - - id: at-de - sort: true - a: - country: { id: austria } - operators: [{ id: oebb }] - b: - country: { id: germany } - operators: [{ id: db }] - points: - - "Passau Hbf" - - "Salzbourg Hbf (trains régionaux vers Salzburg Liefering)" - - "Simbach am Inn" - - "Kufstein" - - "Mittenwald (Gr)" - - "Lindau-Reutin" - - - id: be-nl - a: - country: { id: belgium } - operators: [{ id: sncb }] - b: - country: { id: netherlands } - operators: [{ id: ns }] - points: - - "Roosendaal (fr)" - - "Visé (fr)" - - - id: be-de - a: - country: { id: belgium } - operators: [{ id: sncb }] - b: - country: { id: germany } - operators: [{ id: db }] - points: - - "Aachen Süd (Gr)" - - - id: be-lu - a: - country: { id: belgium } - operators: [{ id: sncb }] - b: - country: { id: luxembourg } - operators: [{ id: cfl }] - points: - - "Athus" - - "Gouvy (fr)" - - "Sterpenich (fr)" - - - id: be-fr - a: - country: { id: belgium } - operators: [{ id: sncb }] - b: - country: { id: france } - operators: [{ id: sncf }] - points: - - "Blandain (fr)" - - "Givet (fr)" - - "Jeumont (fr)" - - "Quévy (fr)" - - "Tourcoing (fr)" - - - id: ba-hr - a: - country: { id: bosnia-and-herzegovina } - operators: [{ id: zfbh }, { id: zrs }] - b: - country: { label: Croatie } - operators: [{ label: HŽ }] - points: - - "Brčko (Gr)" - - "Martin Brod (Gr)" - - "Metković (Gr)" - - "Slavonski Šamac (Gr)" - - "Volinja (Gr)" - - - id: ba-rs - a: - country: { id: bosnia-and-herzegovina } - operators: [{ id: zfbh }, { id: zrs }] - b: - country: { id: serbia } - operators: [{ id: sv }] - points: - - "Zvornik" - - - id: bg-ro - a: - country: { id: bulgaria } - operators: [{ id: bdz }] - b: - country: { id: romania } - operators: [{ id: cfr }] - points: - - "Ruse (fr) (bulgare : Русе)" - - "Vidin (fr)" - - - id: bg-tr - a: - country: { id: bulgaria } - operators: [{ id: bdz }] - b: - country: { label: Turquie } - operators: [{ label: TCDD }] - points: - - "Kapikule (fr)" - - - id: bg-gr - a: - country: { id: bulgaria } - operators: [{ id: bdz }] - b: - country: { id: greece } - operators: [{ id: ht }] - points: - - "Kulata (fr) (bulgare : Кулата)" - - "Svilengrad (fr) (bulgare : Свиленград)" - - - id: bg-rs - a: - country: { id: bulgaria } - operators: [{ id: bdz }] - b: - country: { id: serbia } - operators: [{ id: sv }] - points: - - "Dimitrovgrad (fr) (bulgare : Цариброд, Tsaribrod)" - - - id: cz-pl - a: - country: { id: czechia } - operators: [{ id: cd }] - b: - country: { id: poland } - operators: [{ id: pkp }, { id: kd }, { id: ks }] - points: - - "Bohumín (Gr)" - - "Český Těšín (Gr)" - - "Głuchołazy (Gr) (tchèque : Hlucholazy)" - - "Harrachov (Gr)" - - "Lichkov (Gr) (Plhy City)" - - "Zebrzydowice (Gr)" - - "Voïvodie de Silésie" - - - id: cz-sk - a: - country: { id: czechia } - operators: [{ id: cd }] - b: - country: { id: slovakia } - operators: [{ id: zssk }] - points: - - "Čadca (Gr)" - - "Hodonín (Gr)" - - "Horní Lideč (Gr)" - - "Kúty (Gr)" - - "Myjava (Gr)" - - "Nemšová (Gr)" - - "Skalica na Slovensku (Gr)" - - - id: cz-de - sort: true - a: - country: { id: czechia } - operators: [{ id: cd }] - b: - country: { id: germany } - operators: [{ id: db }] - points: - - "Selb-Plößberg (Gr) / Aš (Gr)" - - "Bayerisch Eisenstein (tchèque : Bavorská Železná ruda)" - - "Cheb (Gr)" - - "Sebnitz (Gr) / Dolní Poustevna (Gr)" - - "Furth im Wald (Gr)" - - "Zittau (Gr)" - - "Potůčky (Gr)" - - "Schöna (Gr)" - - "Rumburk (Gr)" - - "Vejprty (Gr)" - - "Vojtanov (Gr)" - - "Kraslice (Gr)" - - "Waidhaus (Gr)" - - - id: dk-se - a: - country: { id: denmark } - operators: [{ id: dsb }] - b: - country: { label: Suède } - operators: [{ label: SJ }] - points: - - "Helsingborg (via Helsingør)" - - - id: dk-de - a: - country: { id: denmark } - operators: [{ id: dsb }] - b: - country: { id: germany } - operators: [{ id: db }] - points: - - "Flensburg (Gr)" - - "Puttgarden (MS) (via Rødby Faerge)" - - "Tønder (Gr)" - - "Warnemünde (via Gedser)" - - - id: de-se - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { label: Suède } - operators: [{ label: SJ }] - points: - - "Lübeck-Travemünde Hafen" - - "Lübeck-Travemünde Skandinavienkai" - - "Sassnitz (Gr)" - - - id: de-pl - sort: true - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { id: poland } - operators: [{ id: pkp }] - points: - - "Ahlbeck (Gr)" - - "Forst (Gr)" - - "Francfort (Oder) (Gr)" - - "Grambow (Gr)" - - "Gubin (Gr)" - - "Horka (Gr)" - - "Kostrzyn (Gr)" - - "Tantow (Gr)" - - "Zgorzelec (Gr)" - - - id: de-bsb - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: null - operators: [{ id: bsb }] - points: - - "Friedrichshafen" - - "Langenargen" - - "Lindau" - - "Konstanz" - - "Radolfzell" - - "Schaffhausen" - - "Überlingen" - - - id: de-ch - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { id: switzerland } - operators: [{ id: sbb }, { id: bls }, { id: sp }] - points: - - "Basel Bad Bf" - - "Constance" - - "Schaffhausen" - - "Waldshut" - - - id: de-fr - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { id: france } - operators: [{ id: sncf }] - points: - - "Apach (fr)" - - "Forbach (fr)" - - "Hanweiler (Gr)" - - "Kehl (Gr)" - - "Lauterbourg (fr)" - - "Neuenburg (Bd) (Gr)" - - "Wissembourg (fr)" - - - id: de-lu - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { id: luxembourg } - operators: [{ id: cfl }] - points: - - "Igel (Gr)" - - - id: de-eurostar - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: null - operators: [{ id: eurostar }] - points: - - "Aachen" - - "Duisburg" - - "Düsseldorf" - - "Düsseldorf Airport" - - "Essen" - - "Cologne" - - - id: de-nl - a: - country: { id: germany } - operators: [{ id: db }] - b: - country: { id: netherlands } - operators: [{ id: ns }] - points: - - "Bad Bentheim (Gr)" - - "Emmerich (Gr)" - - "Gronau (Westf) (Gr)" - - "Herzogenrath (Gr)" - - "Venlo (Gr)" - - "Weener (Gr)" - - - id: gr-mk - a: - country: { id: greece } - operators: [{ id: ht }] - b: - country: { label: Macédoine du Nord } - operators: [{ label: ŽRSM }] - points: - - "Gevgelija (fr)" - - - id: gr-tr - a: - country: { id: greece } - operators: [{ id: ht }] - b: - country: { label: Turquie } - operators: [{ label: TCDD }] - points: - - "Pythio (Πύθιο)" - - - id: gr-it - a: - country: { id: greece } - operators: [{ id: attica }] - b: - country: { id: italy } - operators: [{ id: attica }] - points: - - "Patras (Πάτρα) [>Ancona, >Bari]" - - "Ancona [>Igoumenitsa, >Patras]" - - "Bari [>Igoumenitsa, >Patras]" - - - id: hu-sk-mav - a: - country: { id: hungary } - operators: [{ id: mav }] - b: - country: { id: slovakia } - operators: [{ id: zssk }] - points: - - "Bánréve (Gr)" - - "Čaňa (Gr)" - - "Fiľakovo (Gr)" - - "Komárom (Gr)" - - "Sátoraljaújhely (Gr)" - - "Szob (Gr)" - - - id: hu-sk-gysev - a: - country: { id: hungary } - operators: [{ id: gysev }] - b: - country: { id: slovakia } - operators: [{ id: gysev }] - points: - - "Rajka (Gr)" - - - id: hu-ua - a: - country: { id: hungary } - operators: [{ id: mav }] - b: - country: { label: Ukraine } - operators: [{ label: UZ }] - points: - - "Záhony (Gr)" - - - id: hu-ro - a: - country: { id: hungary } - operators: [{ id: mav }] - b: - country: { id: romania } - operators: [{ id: cfr }] - points: - - "Biharkeresztes (fr)" - - "Curtici (fr) (hongrois : Kürtös)" - - "Nyirábrány (fr)" - - "Salonta (fr) (hongrois : Nagyszalonta, Szalonta)" - - - id: hu-rs - a: - country: { id: hungary } - operators: [{ id: mav }] - b: - country: { id: serbia } - operators: [{ id: sv }] - points: - - "Röszke (Gr)" - - "Subotica (Gr)" - - - id: hu-hr - a: - country: { id: hungary } - operators: [{ id: mav }] - b: - country: { label: Croatie } - operators: [{ label: HŽ }] - points: - - "Koprivnica (Gr)" - - "Kotoriba (Gr)" - - "Magyarbóly (Gr)" - - - id: hu-si - a: - country: { id: hungary } - operators: [{ id: mav }, { id: gysev }] - b: - country: { id: slovenia } - operators: [{ id: sz }] - points: - - "Hodoš (Gr) (Őrihodos)" - - - id: ie-gb-rail - a: - country: { id: ireland } - operators: [{ id: cie }] - b: - country: { id: united-kingdom } - operators: [{ id: nir }] - points: - - "Dundalk" - - - id: ie-gb-sll - a: - country: { id: ireland } - operators: [{ id: sll }] - b: - country: { id: united-kingdom } - operators: [{ id: sll }] - points: - - "Dublin Bay / Holyhead" - - "Rosslare / Fishguard" - - - id: it-si - a: - country: { id: italy } - operators: [{ id: fs }] - b: - country: { id: slovenia } - operators: [{ id: sz }] - points: - - "Nova Gorica (fr)" - - "Villa Opicina (fr) (slovène : Opčine, triestin : Opcina)" - - - id: fr-it - a: - country: { id: france } - operators: [{ id: sncf }] - b: - country: { id: italy } - operators: [{ id: fs }] - points: - - "Limone-Confine" - - "Modane (fr)" - - "Piene (fr)" - - "Ventimiglia (fr)" - - - id: it-ch - sort: true - a: - country: { id: italy } - operators: [{ id: fs }] - b: - country: { id: switzerland } - operators: [{ id: sbb }, { id: bls }, { id: sp }] - points: - - "Chiasso" - - "Domodossola" - - "Iselle transito [> Brig]" - - "Iselle di Trasquera [> Domodossola]" - - "Domodossola [> Locarno]" - - "Locarno [> Domodossola]" - - "Porto Ceresio [> Lugano]" - - "Lugano [> Porto Ceresio]" - - "Pino transito" - - "Tirano" - - - id: fr-ch - a: - country: { id: france } - operators: [{ id: sncf }] - b: - country: { id: switzerland } - operators: [{ id: sbb }, { id: bls }, { id: sp }] - points: - - "Annemasse" - - "Bâle SBB" - - "Delle (fr)" - - "Genève [> Bellegarde]" - - "Le Châtelard-Frontière (fr)" - - "Le Locle-Col-des-Roches" - - "Les Verrières (fr)" - - "Vallorbe" - - - id: lu-fr - a: - country: { id: luxembourg } - operators: [{ id: cfl }] - b: - country: { id: france } - operators: [{ id: sncf }] - points: - - "Bettembourg (fr)" - - "Rodange (fr)" - - - id: es-fr - a: - country: { id: spain } - operators: [{ id: renfe }] - b: - country: { id: france } - operators: [{ id: sncf }] - points: - - "Canfranc (fr)" - - "Hendaye (fr)" - - "Port Bou (fr)" - - "La Tour-de-Carol-Enveitg" - - - id: fr-eurostar - a: - country: { id: france } - operators: [{ id: sncf }] - b: - country: null - operators: [{ id: eurostar }] - points: - - "Paris" - - "Lille" - - - id: gb-eurostar - a: - country: { id: united-kingdom } - operators: [{ id: gb }] - b: - country: { id: france } - operators: [{ id: eurostar }] - points: - - "London St. Pancras International" - - - id: nl-gb-stl - a: - country: { id: netherlands } - operators: [{ id: stl }] - b: - country: { id: united-kingdom } - operators: [{ id: stl }] - points: - - "Hoek van Holland / Harwich P.Q." - - - id: gb-gb-sll - a: - country: { id: united-kingdom } - operators: [{ id: sll }] - b: - country: { id: united-kingdom } - operators: [{ id: sll }] - points: - - "Cairnryan" - - "Liverpool" - - "Belfast" - - - id: lv-ee - a: - country: { id: latvia } - operators: [{ label: LDz }] - b: - country: { label: Estonie } - points: - - "Valga" - - - id: lv-ru - a: - country: { id: latvia } - operators: [{ label: LDz }] - b: - country: { label: Russie } - points: - - "Frontière fermée" - - - id: lv-by - a: - country: { id: latvia } - operators: [{ label: LDz }] - b: - country: { label: Biélorussie } - points: - - "Frontière fermée" - - - id: lv-lt - a: - country: { id: latvia } - operators: [{ label: LDz }] - b: - country: { id: lithuania } - operators: [{ id: ltg }] - points: - - "Joniškis" - - - id: lt-by - a: - country: { id: lithuania } - operators: [{ id: ltg }] - b: - country: { label: Biélorussie } - points: - - "Frontière fermée" - - - id: lt-pl - a: - country: { id: lithuania } - operators: [{ id: ltg }] - b: - country: { id: poland } - operators: [{ id: pkp }] - points: - - "Mockava (Gr)" - - - id: lt-ru - a: - country: { id: lithuania } - operators: [{ id: ltg }] - b: - country: { label: Russie } - points: - - "Pas de montée/descente en transit Russie-Biélorussie-Lituanie-Kaliningrad" - - - id: me-rs - a: - country: { id: montenegro } - operators: [{ id: zpcg }] - b: - country: { id: serbia } - operators: [{ id: sv }] - points: - - "Bijelo Polje (Gr)" - - - id: no-se - a: - country: { id: norway } - operators: [{ id: vy }] - b: - country: { label: Suède } - operators: [{ label: SJ }] - points: - - "Bjørnfjell (Gr)" - - "Halden (Kornsjø (Gr))" - - "Kongsvinger (Charlottenberg (Gr))" - - "Storlien" - - - id: pl-ru - a: - country: { id: poland } - operators: [{ id: pkp }] - b: - country: { label: Russie } - operators: [{ label: RZD }] - points: - - "Braniewo (Gr)" - - - id: pl-by - a: - country: { id: poland } - operators: [{ id: pkp }] - b: - country: { label: Biélorussie } - operators: [{ label: BC }] - points: - - "Brest (Gr) (Брэст)" - - "Bruzgi / Bruzhi (Gr)" - - "Czeremcha (Gr) (Voïvodie de Podlachie)" - - - id: pl-ua - a: - country: { id: poland } - operators: [{ id: pkp }] - b: - country: { label: Ukraine } - operators: [{ label: UZ }] - points: - - "Jagodin (Gr) (Yahodyn, Yagodyn ou Ягодин)" - - "Medyka (Gr)" - - - id: pl-sk - a: - country: { id: poland } - operators: [{ id: pkp }] - b: - country: { id: slovakia } - operators: [{ id: zssk }] - points: - - "Lupkow (Gr)" - - - id: ro-ua - a: - country: { id: romania } - operators: [{ id: cfr }] - b: - country: { label: Ukraine } - operators: [{ label: UZ }] - points: - - "Vicsani (fr)" - - - id: ro-md - a: - country: { id: romania } - operators: [{ id: cfr }] - b: - country: { label: Moldavie } - operators: [{ label: CFM }] - points: - - "Iasi" - - "Ungheni (fr)" - - - id: ro-rs - a: - country: { id: romania } - operators: [{ id: cfr }] - b: - country: { id: serbia } - operators: [{ id: sv }] - points: - - "Jimbolia (fr) (serbe : Жомбољ)" - - "Vršac (fr) (serbe : Вршац)" - - - id: rs-mk - a: - country: { id: serbia } - operators: [{ id: sv }] - b: - country: { label: Macédoine du Nord } - operators: [{ label: ŽRSM }] - points: - - "Tabanovci (fr) (serbe : Табановце ; albanais : Tabanoc)" - - - id: rs-hr - a: - country: { id: serbia } - operators: [{ id: sv }] - b: - country: { label: Croatie } - operators: [{ label: HŽ }] - points: - - "Erdut (Gr) (serbe : Ердут)" - - "Šid (Gr) (serbe : Шид)" - - - id: si-hr - a: - country: { id: slovenia } - operators: [{ id: sz }] - b: - country: { label: Croatie } - operators: [{ label: HŽ }] - points: - - "Buzet (Gr)" - - "Čakovec (Gr)" - - "Dobova (Gr)" - - "Kumrovec (Gr)" - - "Metlika (Gr)" - - "Mursko Središće (Gr)" - - "Rogatec (Gr)" - - "Šapjane (Gr)" - - - id: pt-es - a: - country: { id: portugal } - operators: [{ id: cp }] - b: - country: { id: spain } - operators: [{ id: renfe }] - points: - - "Badajoz (fr)" - - "Barca de Alva (fr)" - - "Fuentes de Oñoro (fr)" - - "Valença (fr)" - - "Valencia de Alcántara (fr)" - - "V. Real de Sto António Guardiana [> Ayamonte]" +- id: at-cz + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: czechia + operators: + - id: cd + points: + - Bernhardsthal (Gr) / Břeclav (Gr) + - Unterretzbach (Gr) / Retz (Gr) + - Gmünd (Gr) / Česká Skalice (Gr) + - Summerau (Gr) / Horní Dvořiště (Gr) +- id: at-sk + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: slovakia + operators: + - id: zssk + points: + - Marchegg (Gr) + - Kittsee (Gr) +- id: at-hu-gysev + a: + country: + id: austria + operators: + - id: gysev + b: + country: + id: hungary + operators: + - id: gysev + points: + - Pamhagen (Gr) + - Szentgotthárd + - Sopron +- id: at-hu-mav + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: hungary + operators: + - id: mav + points: + - Hegyeshalom (Gr) + - Sopron +- id: at-si + sort: true + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: slovenia + operators: + - id: sz + points: + - "Bleiburg (Gr) (slovène : Pliberk)" + - "Spielfeld-Strass (Gr) / Spielfeld (Gr) (slovène : Špilje)" + - "Rosenbach (Gr) / Jesenice (Gr) (allemand : Assling)" +- id: at-it + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: italy + operators: + - id: fs + points: + - Brennero/Brenner + - San Candido/Innichen + - Tarvisio Boscoverde +- id: at-ch + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: switzerland + operators: + - id: sbb + points: + - Buchs SG + - St. Margrethen +- id: at-de + sort: true + a: + country: + id: austria + operators: + - id: oebb + b: + country: + id: germany + operators: + - id: db + points: + - Passau Hbf + - Salzbourg Hbf (trains régionaux vers Salzburg Liefering) + - Simbach am Inn + - Kufstein + - Mittenwald (Gr) + - Lindau-Reutin +- id: be-nl + a: + country: + id: belgium + operators: + - id: sncb + b: + country: + id: netherlands + operators: + - id: ns + points: + - Roosendaal (fr) + - Visé (fr) +- id: be-de + a: + country: + id: belgium + operators: + - id: sncb + b: + country: + id: germany + operators: + - id: db + points: + - Aachen Süd (Gr) +- id: be-lu + a: + country: + id: belgium + operators: + - id: sncb + b: + country: + id: luxembourg + operators: + - id: cfl + points: + - Athus + - Gouvy (fr) + - Sterpenich (fr) +- id: be-fr + a: + country: + id: belgium + operators: + - id: sncb + b: + country: + id: france + operators: + - id: sncf + points: + - Blandain (fr) + - Givet (fr) + - Jeumont (fr) + - Quévy (fr) + - Tourcoing (fr) +- id: ba-hr + a: + country: + id: bosnia-and-herzegovina + operators: + - id: zfbh + - id: zrs + b: + country: + label: Croatie + operators: + - label: HŽ + points: + - Brčko (Gr) + - Martin Brod (Gr) + - Metković (Gr) + - Slavonski Šamac (Gr) + - Volinja (Gr) +- id: ba-rs + a: + country: + id: bosnia-and-herzegovina + operators: + - id: zfbh + - id: zrs + b: + country: + id: serbia + operators: + - id: sv + points: + - Zvornik +- id: bg-ro + a: + country: + id: bulgaria + operators: + - id: bdz + b: + country: + id: romania + operators: + - id: cfr + points: + - "Ruse (fr) (bulgare : Русе)" + - Vidin (fr) +- id: bg-tr + a: + country: + id: bulgaria + operators: + - id: bdz + b: + country: + label: Turquie + operators: + - label: TCDD + points: + - Kapikule (fr) +- id: bg-gr + a: + country: + id: bulgaria + operators: + - id: bdz + b: + country: + id: greece + operators: + - id: ht + points: + - "Kulata (fr) (bulgare : Кулата)" + - "Svilengrad (fr) (bulgare : Свиленград)" +- id: bg-rs + a: + country: + id: bulgaria + operators: + - id: bdz + b: + country: + id: serbia + operators: + - id: sv + points: + - "Dimitrovgrad (fr) (bulgare : Цариброд, Tsaribrod)" +- id: cz-pl + a: + country: + id: czechia + operators: + - id: cd + b: + country: + id: poland + operators: + - id: pkp + - id: kd + - id: ks + points: + - Bohumín (Gr) + - Český Těšín (Gr) + - "Głuchołazy (Gr) (tchèque : Hlucholazy)" + - Harrachov (Gr) + - Lichkov (Gr) (Plhy City) + - Zebrzydowice (Gr) + - Voïvodie de Silésie +- id: cz-sk + a: + country: + id: czechia + operators: + - id: cd + b: + country: + id: slovakia + operators: + - id: zssk + points: + - Čadca (Gr) + - Hodonín (Gr) + - Horní Lideč (Gr) + - Kúty (Gr) + - Myjava (Gr) + - Nemšová (Gr) + - Skalica na Slovensku (Gr) +- id: cz-de + sort: true + a: + country: + id: czechia + operators: + - id: cd + b: + country: + id: germany + operators: + - id: db + points: + - Selb-Plößberg (Gr) / Aš (Gr) + - "Bayerisch Eisenstein (tchèque : Bavorská Železná ruda)" + - Cheb (Gr) + - Sebnitz (Gr) / Dolní Poustevna (Gr) + - Furth im Wald (Gr) + - Zittau (Gr) + - Potůčky (Gr) + - Schöna (Gr) + - Rumburk (Gr) + - Vejprty (Gr) + - Vojtanov (Gr) + - Kraslice (Gr) + - Waidhaus (Gr) +- id: dk-se + a: + country: + id: denmark + operators: + - id: dsb + b: + country: + label: Suède + operators: + - label: SJ + points: + - Helsingborg (via Helsingør) +- id: dk-de + a: + country: + id: denmark + operators: + - id: dsb + b: + country: + id: germany + operators: + - id: db + points: + - Flensburg (Gr) + - Puttgarden (MS) (via Rødby Faerge) + - Tønder (Gr) + - Warnemünde (via Gedser) +- id: de-se + a: + country: + id: germany + operators: + - id: db + b: + country: + label: Suède + operators: + - label: SJ + points: + - Lübeck-Travemünde Hafen + - Lübeck-Travemünde Skandinavienkai + - Sassnitz (Gr) +- id: de-pl + sort: true + a: + country: + id: germany + operators: + - id: db + b: + country: + id: poland + operators: + - id: pkp + points: + - Ahlbeck (Gr) + - Forst (Gr) + - Francfort (Oder) (Gr) + - Grambow (Gr) + - Gubin (Gr) + - Horka (Gr) + - Kostrzyn (Gr) + - Tantow (Gr) + - Zgorzelec (Gr) +- id: de-bsb + a: + country: + id: germany + operators: + - id: db + b: + country: + operators: + - id: bsb + points: + - Friedrichshafen + - Langenargen + - Lindau + - Konstanz + - Radolfzell + - Schaffhausen + - Überlingen +- id: de-ch + a: + country: + id: germany + operators: + - id: db + b: + country: + id: switzerland + operators: + - id: sbb + - id: bls + - id: sp + points: + - Basel Bad Bf + - Constance + - Schaffhausen + - Waldshut +- id: de-fr + a: + country: + id: germany + operators: + - id: db + b: + country: + id: france + operators: + - id: sncf + points: + - Apach (fr) + - Forbach (fr) + - Hanweiler (Gr) + - Kehl (Gr) + - Lauterbourg (fr) + - Neuenburg (Bd) (Gr) + - Wissembourg (fr) +- id: de-lu + a: + country: + id: germany + operators: + - id: db + b: + country: + id: luxembourg + operators: + - id: cfl + points: + - Igel (Gr) +- id: de-eurostar + a: + country: + id: germany + operators: + - id: db + b: + country: + operators: + - id: eurostar + points: + - Aachen + - Duisburg + - Düsseldorf + - Düsseldorf Airport + - Essen + - Cologne +- id: de-nl + a: + country: + id: germany + operators: + - id: db + b: + country: + id: netherlands + operators: + - id: ns + points: + - Bad Bentheim (Gr) + - Emmerich (Gr) + - Gronau (Westf) (Gr) + - Herzogenrath (Gr) + - Venlo (Gr) + - Weener (Gr) +- id: gr-mk + a: + country: + id: greece + operators: + - id: ht + b: + country: + label: Macédoine du Nord + operators: + - label: ŽRSM + points: + - Gevgelija (fr) +- id: gr-tr + a: + country: + id: greece + operators: + - id: ht + b: + country: + label: Turquie + operators: + - label: TCDD + points: + - Pythio (Πύθιο) +- id: gr-it + a: + country: + id: greece + operators: + - id: attica + b: + country: + id: italy + operators: + - id: attica + points: + - Patras (Πάτρα) [>Ancona, >Bari] + - Ancona [>Igoumenitsa, >Patras] + - Bari [>Igoumenitsa, >Patras] +- id: hu-sk-mav + a: + country: + id: hungary + operators: + - id: mav + b: + country: + id: slovakia + operators: + - id: zssk + points: + - Bánréve (Gr) + - Čaňa (Gr) + - Fiľakovo (Gr) + - Komárom (Gr) + - Sátoraljaújhely (Gr) + - Szob (Gr) +- id: hu-sk-gysev + a: + country: + id: hungary + operators: + - id: gysev + b: + country: + id: slovakia + operators: + - id: gysev + points: + - Rajka (Gr) +- id: hu-ua + a: + country: + id: hungary + operators: + - id: mav + b: + country: + label: Ukraine + operators: + - label: UZ + points: + - Záhony (Gr) +- id: hu-ro + a: + country: + id: hungary + operators: + - id: mav + b: + country: + id: romania + operators: + - id: cfr + points: + - Biharkeresztes (fr) + - "Curtici (fr) (hongrois : Kürtös)" + - Nyirábrány (fr) + - "Salonta (fr) (hongrois : Nagyszalonta, Szalonta)" +- id: hu-rs + a: + country: + id: hungary + operators: + - id: mav + b: + country: + id: serbia + operators: + - id: sv + points: + - Röszke (Gr) + - Subotica (Gr) +- id: hu-hr + a: + country: + id: hungary + operators: + - id: mav + b: + country: + label: Croatie + operators: + - label: HŽ + points: + - Koprivnica (Gr) + - Kotoriba (Gr) + - Magyarbóly (Gr) +- id: hu-si + a: + country: + id: hungary + operators: + - id: mav + - id: gysev + b: + country: + id: slovenia + operators: + - id: sz + points: + - Hodoš (Gr) (Őrihodos) +- id: ie-gb-rail + a: + country: + id: ireland + operators: + - id: cie + b: + country: + id: united-kingdom + operators: + - id: nir + points: + - Dundalk +- id: ie-gb-sll + a: + country: + id: ireland + operators: + - id: sll + b: + country: + id: united-kingdom + operators: + - id: sll + points: + - Dublin Bay / Holyhead + - Rosslare / Fishguard +- id: it-si + a: + country: + id: italy + operators: + - id: fs + b: + country: + id: slovenia + operators: + - id: sz + points: + - Nova Gorica (fr) + - "Villa Opicina (fr) (slovène : Opčine, triestin : Opcina)" +- id: fr-it + a: + country: + id: france + operators: + - id: sncf + b: + country: + id: italy + operators: + - id: fs + points: + - Limone-Confine + - Modane (fr) + - Piene (fr) + - Ventimiglia (fr) +- id: it-ch + sort: true + a: + country: + id: italy + operators: + - id: fs + b: + country: + id: switzerland + operators: + - id: sbb + - id: bls + - id: sp + points: + - Chiasso + - Domodossola + - Iselle transito [> Brig] + - Iselle di Trasquera [> Domodossola] + - Domodossola [> Locarno] + - Locarno [> Domodossola] + - Porto Ceresio [> Lugano] + - Lugano [> Porto Ceresio] + - Pino transito + - Tirano +- id: fr-ch + a: + country: + id: france + operators: + - id: sncf + b: + country: + id: switzerland + operators: + - id: sbb + - id: bls + - id: sp + points: + - Annemasse + - Bâle SBB + - Delle (fr) + - Genève [> Bellegarde] + - Le Châtelard-Frontière (fr) + - Le Locle-Col-des-Roches + - Les Verrières (fr) + - Vallorbe +- id: lu-fr + a: + country: + id: luxembourg + operators: + - id: cfl + b: + country: + id: france + operators: + - id: sncf + points: + - Bettembourg (fr) + - Rodange (fr) +- id: es-fr + a: + country: + id: spain + operators: + - id: renfe + b: + country: + id: france + operators: + - id: sncf + points: + - Canfranc (fr) + - Hendaye (fr) + - Port Bou (fr) + - La Tour-de-Carol-Enveitg +- id: fr-eurostar + a: + country: + id: france + operators: + - id: sncf + b: + country: + operators: + - id: eurostar + points: + - Paris + - Lille +- id: gb-eurostar + a: + country: + id: united-kingdom + operators: + - id: gb + b: + country: + id: france + operators: + - id: eurostar + points: + - London St. Pancras International +- id: nl-gb-stl + a: + country: + id: netherlands + operators: + - id: stl + b: + country: + id: united-kingdom + operators: + - id: stl + points: + - Hoek van Holland / Harwich P.Q. +- id: gb-gb-sll + a: + country: + id: united-kingdom + operators: + - id: sll + b: + country: + id: united-kingdom + operators: + - id: sll + points: + - Cairnryan + - Liverpool + - Belfast +- id: lv-ee + a: + country: + id: latvia + operators: + - label: LDz + b: + country: + label: Estonie + points: + - Valga +- id: lv-ru + a: + country: + id: latvia + operators: + - label: LDz + b: + country: + label: Russie + points: + - Frontière fermée +- id: lv-by + a: + country: + id: latvia + operators: + - label: LDz + b: + country: + label: Biélorussie + points: + - Frontière fermée +- id: lv-lt + a: + country: + id: latvia + operators: + - label: LDz + b: + country: + id: lithuania + operators: + - id: ltg + points: + - Joniškis +- id: lt-by + a: + country: + id: lithuania + operators: + - id: ltg + b: + country: + label: Biélorussie + points: + - Frontière fermée +- id: lt-pl + a: + country: + id: lithuania + operators: + - id: ltg + b: + country: + id: poland + operators: + - id: pkp + points: + - Mockava (Gr) +- id: lt-ru + a: + country: + id: lithuania + operators: + - id: ltg + b: + country: + label: Russie + points: + - Pas de montée/descente en transit Russie-Biélorussie-Lituanie-Kaliningrad +- id: me-rs + a: + country: + id: montenegro + operators: + - id: zpcg + b: + country: + id: serbia + operators: + - id: sv + points: + - Bijelo Polje (Gr) +- id: no-se + a: + country: + id: norway + operators: + - id: vy + b: + country: + label: Suède + operators: + - label: SJ + points: + - Bjørnfjell (Gr) + - Halden (Kornsjø (Gr)) + - Kongsvinger (Charlottenberg (Gr)) + - Storlien +- id: pl-ru + a: + country: + id: poland + operators: + - id: pkp + b: + country: + label: Russie + operators: + - label: RZD + points: + - Braniewo (Gr) +- id: pl-by + a: + country: + id: poland + operators: + - id: pkp + b: + country: + label: Biélorussie + operators: + - label: BC + points: + - Brest (Gr) (Брэст) + - Bruzgi / Bruzhi (Gr) + - Czeremcha (Gr) (Voïvodie de Podlachie) +- id: pl-ua + a: + country: + id: poland + operators: + - id: pkp + b: + country: + label: Ukraine + operators: + - label: UZ + points: + - Jagodin (Gr) (Yahodyn, Yagodyn ou Ягодин) + - Medyka (Gr) +- id: pl-sk + a: + country: + id: poland + operators: + - id: pkp + b: + country: + id: slovakia + operators: + - id: zssk + points: + - Lupkow (Gr) +- id: ro-ua + a: + country: + id: romania + operators: + - id: cfr + b: + country: + label: Ukraine + operators: + - label: UZ + points: + - Vicsani (fr) +- id: ro-md + a: + country: + id: romania + operators: + - id: cfr + b: + country: + label: Moldavie + operators: + - label: CFM + points: + - Iasi + - Ungheni (fr) +- id: ro-rs + a: + country: + id: romania + operators: + - id: cfr + b: + country: + id: serbia + operators: + - id: sv + points: + - "Jimbolia (fr) (serbe : Жомбољ)" + - "Vršac (fr) (serbe : Вршац)" +- id: rs-mk + a: + country: + id: serbia + operators: + - id: sv + b: + country: + label: Macédoine du Nord + operators: + - label: ŽRSM + points: + - "Tabanovci (fr) (serbe : Табановце ; albanais : Tabanoc)" +- id: rs-hr + a: + country: + id: serbia + operators: + - id: sv + b: + country: + label: Croatie + operators: + - label: HŽ + points: + - "Erdut (Gr) (serbe : Ердут)" + - "Šid (Gr) (serbe : Шид)" +- id: si-hr + a: + country: + id: slovenia + operators: + - id: sz + b: + country: + label: Croatie + operators: + - label: HŽ + points: + - Buzet (Gr) + - Čakovec (Gr) + - Dobova (Gr) + - Kumrovec (Gr) + - Metlika (Gr) + - Mursko Središće (Gr) + - Rogatec (Gr) + - Šapjane (Gr) +- id: pt-es + a: + country: + id: portugal + operators: + - id: cp + b: + country: + id: spain + operators: + - id: renfe + points: + - Badajoz (fr) + - Barca de Alva (fr) + - Fuentes de Oñoro (fr) + - Valença (fr) + - Valencia de Alcántara (fr) + - V. Real de Sto António Guardiana [> Ayamonte] diff --git a/content/country/bosnia-and-herzegovina/index.de.md b/content/country/bosnia-and-herzegovina/index.de.md index 996155246..793fd366f 100644 --- a/content/country/bosnia-and-herzegovina/index.de.md +++ b/content/country/bosnia-and-herzegovina/index.de.md @@ -1,6 +1,10 @@ --- -title: "Bosnien und Herzegowina" -country: "bosnia-and-herzegovina" +title: Bosnien und Herzegowina +country: bosnia-and-herzegovina +params: + border_points: + - ba-hr + - ba-rs --- ## FIP Nutzung diff --git a/content/country/bosnia-and-herzegovina/index.en.md b/content/country/bosnia-and-herzegovina/index.en.md index d01262379..49f0c289a 100644 --- a/content/country/bosnia-and-herzegovina/index.en.md +++ b/content/country/bosnia-and-herzegovina/index.en.md @@ -1,6 +1,10 @@ --- -title: "Bosnia and Herzegovina" -country: "bosnia-and-herzegovina" +title: Bosnia and Herzegovina +country: bosnia-and-herzegovina +params: + border_points: + - ba-hr + - ba-rs --- ## FIP Information diff --git a/content/country/bosnia-and-herzegovina/index.fr.md b/content/country/bosnia-and-herzegovina/index.fr.md index 9d4ce6a9b..7a5e2542f 100644 --- a/content/country/bosnia-and-herzegovina/index.fr.md +++ b/content/country/bosnia-and-herzegovina/index.fr.md @@ -1,6 +1,10 @@ --- -title: "Bosnie-Herzégovine" -country: "bosnia-and-herzegovina" +title: Bosnie-Herzégovine +country: bosnia-and-herzegovina +params: + border_points: + - ba-hr + - ba-rs --- ## Informations FIP diff --git a/content/country/bulgaria/index.de.md b/content/country/bulgaria/index.de.md index f7fd09f68..ed5d2f723 100644 --- a/content/country/bulgaria/index.de.md +++ b/content/country/bulgaria/index.de.md @@ -4,6 +4,11 @@ country: bulgaria params: operators_without_fip: - Optima Express + border_points: + - bg-ro + - bg-tr + - bg-gr + - bg-rs --- ## FIP Nutzung diff --git a/content/country/bulgaria/index.en.md b/content/country/bulgaria/index.en.md index 323b3d586..9ac943413 100644 --- a/content/country/bulgaria/index.en.md +++ b/content/country/bulgaria/index.en.md @@ -4,6 +4,11 @@ country: bulgaria params: operators_without_fip: - Optima Express + border_points: + - bg-ro + - bg-tr + - bg-gr + - bg-rs --- ## FIP Information diff --git a/content/country/bulgaria/index.fr.md b/content/country/bulgaria/index.fr.md index 8e24aef5b..571f7cb6e 100644 --- a/content/country/bulgaria/index.fr.md +++ b/content/country/bulgaria/index.fr.md @@ -4,6 +4,11 @@ country: bulgaria params: operators_without_fip: - Optima Express + border_points: + - bg-ro + - bg-tr + - bg-gr + - bg-rs --- ## Informations FIP diff --git a/content/country/czechia/index.de.md b/content/country/czechia/index.de.md index c5e670d98..7088d2f5e 100644 --- a/content/country/czechia/index.de.md +++ b/content/country/czechia/index.de.md @@ -10,6 +10,11 @@ params: - Leo Express - RegioJet - Trilex / Die Länderbahn + border_points: + - cz-pl + - cz-sk + - at-cz + - cz-de --- ## FIP Nutzung diff --git a/content/country/czechia/index.en.md b/content/country/czechia/index.en.md index 3a7f422c3..003115ce5 100644 --- a/content/country/czechia/index.en.md +++ b/content/country/czechia/index.en.md @@ -10,6 +10,11 @@ params: - Leo Express - RegioJet - Trilex / Die Länderbahn + border_points: + - cz-pl + - cz-sk + - at-cz + - cz-de --- ## FIP Information diff --git a/content/country/czechia/index.fr.md b/content/country/czechia/index.fr.md index a91f29968..f3fafa7ef 100644 --- a/content/country/czechia/index.fr.md +++ b/content/country/czechia/index.fr.md @@ -10,6 +10,11 @@ params: - Leo Express - RegioJet - Trilex / Die Länderbahn + border_points: + - cz-pl + - cz-sk + - at-cz + - cz-de --- ## Informations FIP diff --git a/content/country/denmark/index.de.md b/content/country/denmark/index.de.md index acf5f88fe..8e40d6823 100644 --- a/content/country/denmark/index.de.md +++ b/content/country/denmark/index.de.md @@ -9,6 +9,9 @@ params: - Nordjyske Jernbaner - SJ - Snälltåget + border_points: + - dk-se + - dk-de --- ## FIP Nutzung diff --git a/content/country/denmark/index.en.md b/content/country/denmark/index.en.md index ab4ee6a48..4cbb61e68 100644 --- a/content/country/denmark/index.en.md +++ b/content/country/denmark/index.en.md @@ -9,6 +9,9 @@ params: - Nordjyske Jernbaner - SJ - Snälltåget + border_points: + - dk-se + - dk-de --- ## FIP Information diff --git a/content/country/denmark/index.fr.md b/content/country/denmark/index.fr.md index 8252f25ac..0361df0c0 100644 --- a/content/country/denmark/index.fr.md +++ b/content/country/denmark/index.fr.md @@ -9,6 +9,9 @@ params: - Nordjyske Jernbaner - SJ - Snälltåget + border_points: + - dk-se + - dk-de --- ## Informations FIP diff --git a/content/country/france/index.de.md b/content/country/france/index.de.md index 2dd956f66..af00b5329 100644 --- a/content/country/france/index.de.md +++ b/content/country/france/index.de.md @@ -4,14 +4,21 @@ 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)](/operator/fs/#internationale-frecciarossa-züge-nach-paris "Frecciarossa (Trenitalia)")' - Getlink (Eurotunnel LeShuttle) - GoVolta - '[OUIGO](/operator/sncf#Fernverkehr "OUIGO")' - RATP - Transdev + border_points: + - fr-eurostar + - be-fr + - lu-fr + - de-fr + - fr-ch + - fr-it + - es-fr --- ## FIP Nutzung diff --git a/content/country/france/index.en.md b/content/country/france/index.en.md index 6d995d80b..867edd226 100644 --- a/content/country/france/index.en.md +++ b/content/country/france/index.en.md @@ -4,14 +4,21 @@ 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)](/operator/fs/#international-frecciarossa-trains-to-paris "Frecciarossa (Trenitalia)")' - Getlink (Eurotunnel LeShuttle) - GoVolta - '[OUIGO](/operator/sncf#Fernverkehr "OUIGO")' - RATP - Transdev + border_points: + - fr-eurostar + - be-fr + - lu-fr + - de-fr + - fr-ch + - fr-it + - es-fr --- ## FIP Information diff --git a/content/country/france/index.fr.md b/content/country/france/index.fr.md index 4f3e1e77e..536d7dfa2 100644 --- a/content/country/france/index.fr.md +++ b/content/country/france/index.fr.md @@ -4,14 +4,21 @@ 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)](/operator/fs/#trains-frecciarossa-internationaux-vers-paris "Frecciarossa (Trenitalia)")’ - Getlink (Eurotunnel LeShuttle) - GoVolta - ’[OUIGO](/operator/sncf#Fernverkehr "OUIGO")’ - RATP - Transdev + border_points: + - fr-eurostar + - be-fr + - lu-fr + - de-fr + - fr-ch + - fr-it + - es-fr --- ## Informations FIP diff --git a/content/country/germany/index.de.md b/content/country/germany/index.de.md index ddeb7bdd0..85ec5f353 100644 --- a/content/country/germany/index.de.md +++ b/content/country/germany/index.de.md @@ -81,6 +81,21 @@ params: - WESTbahn – WB - WestfalenBahn – WFB - Württembergische Eisenbahn-Gesellschaft mbH – WEG + border_points: + - dk-de + - de-se + - de-pl + - cz-de + - at-de + - de-bsb + - de-ch + - de-fr + - de-lu + - be-de + - de-eurostar + - de-nl + border_points_footnotes: + - MS = Mitte See --- ## FIP Nutzung diff --git a/content/country/germany/index.en.md b/content/country/germany/index.en.md index 06fde1a55..377732f7a 100644 --- a/content/country/germany/index.en.md +++ b/content/country/germany/index.en.md @@ -81,6 +81,21 @@ params: - WESTbahn – WB - WestfalenBahn – WFB - Württembergische Eisenbahn-Gesellschaft mbH – WEG + border_points: + - dk-de + - de-se + - de-pl + - cz-de + - at-de + - de-bsb + - de-ch + - de-fr + - de-lu + - be-de + - de-eurostar + - de-nl + border_points_footnotes: + - MS = Middle of the lake --- ## FIP Information diff --git a/content/country/germany/index.fr.md b/content/country/germany/index.fr.md index cb0b202af..35f1a38ea 100644 --- a/content/country/germany/index.fr.md +++ b/content/country/germany/index.fr.md @@ -81,6 +81,21 @@ params: - WESTbahn – WB - WestfalenBahn – WFB - Württembergische Eisenbahn-Gesellschaft mbH – WEG + border_points: + - dk-de + - de-se + - de-pl + - cz-de + - at-de + - de-bsb + - de-ch + - de-fr + - de-lu + - be-de + - de-eurostar + - de-nl + border_points_footnotes: + - MS = Milieu du lac --- ## Informations FIP diff --git a/content/country/greece/index.de.md b/content/country/greece/index.de.md index e336973ac..6891c87b5 100644 --- a/content/country/greece/index.de.md +++ b/content/country/greece/index.de.md @@ -5,6 +5,14 @@ params: operators_without_fip: - STASY (Urban Rail Transport S.A.) - THEMA S.A. – Thessaloniki Metro + border_points: + - gr-mk + - bg-gr + - gr-tr + - gr-it + border_points_footnotes: + - "[>] = In Richtung (z. B. Patras [> Ancona] = Patras ist der Grenzpunkt in Richtung + Ancona)" --- ## FIP Nutzung diff --git a/content/country/greece/index.en.md b/content/country/greece/index.en.md index 6bb9d84c5..c82369880 100644 --- a/content/country/greece/index.en.md +++ b/content/country/greece/index.en.md @@ -5,6 +5,14 @@ params: operators_without_fip: - STASY (Urban Rail Transport S.A.) - THEMA S.A. – Thessaloniki Metro + border_points: + - gr-mk + - bg-gr + - gr-tr + - gr-it + border_points_footnotes: + - "[>] = In the direction of (e.g. Patras [> Ancona] = Patras is the border point + in the direction of Ancona)" --- ## FIP Information diff --git a/content/country/greece/index.fr.md b/content/country/greece/index.fr.md index c30fefeae..7b2d7fa77 100644 --- a/content/country/greece/index.fr.md +++ b/content/country/greece/index.fr.md @@ -5,6 +5,14 @@ params: operators_without_fip: - STASY (Urban Rail Transport S.A.) - THEMA S.A. – Thessaloniki Metro + border_points: + - gr-mk + - bg-gr + - gr-tr + - gr-it + border_points_footnotes: + - "[>] = En direction de (par ex. Patras [> Ancona] = Patras est le point frontière + en direction d’Ancona)" --- ## Informations FIP diff --git a/content/country/hungary/index.de.md b/content/country/hungary/index.de.md index 4d1965b1a..c8d03e117 100644 --- a/content/country/hungary/index.de.md +++ b/content/country/hungary/index.de.md @@ -5,6 +5,16 @@ params: operators_without_fip: - RegioJet - BKV Zrt. (Budapesti Közlekedési Zártkörűen Működő Részvénytársaság) + border_points: + - hu-sk-mav + - hu-sk-gysev + - hu-ua + - hu-ro + - hu-rs + - hu-hr + - hu-si + - at-hu-mav + - at-hu-gysev --- ## FIP Nutzung diff --git a/content/country/hungary/index.en.md b/content/country/hungary/index.en.md index cd21a7b95..fc6d80a87 100644 --- a/content/country/hungary/index.en.md +++ b/content/country/hungary/index.en.md @@ -5,6 +5,16 @@ params: operators_without_fip: - RegioJet - BKV Zrt. (Budapesti Közlekedési Zártkörűen Működő Részvénytársaság) + border_points: + - hu-sk-mav + - hu-sk-gysev + - hu-ua + - hu-ro + - hu-rs + - hu-hr + - hu-si + - at-hu-mav + - at-hu-gysev --- ## FIP Information diff --git a/content/country/hungary/index.fr.md b/content/country/hungary/index.fr.md index 78932ab6d..68dd14c8c 100644 --- a/content/country/hungary/index.fr.md +++ b/content/country/hungary/index.fr.md @@ -5,6 +5,16 @@ params: operators_without_fip: - RegioJet - BKV Zrt. (Budapesti Közlekedési Zártkörűen Működő Részvénytársaság) + border_points: + - hu-sk-mav + - hu-sk-gysev + - hu-ua + - hu-ro + - hu-rs + - hu-hr + - hu-si + - at-hu-mav + - at-hu-gysev --- ## Informations FIP diff --git a/content/country/ireland/index.de.md b/content/country/ireland/index.de.md index 7ced741e6..121a157a9 100644 --- a/content/country/ireland/index.de.md +++ b/content/country/ireland/index.de.md @@ -4,6 +4,9 @@ country: ireland params: operators_without_fip: - Transdev (Luas - Straßenbahn Dublin) + border_points: + - ie-gb-rail + - ie-gb-sll --- ## FIP Nutzung diff --git a/content/country/ireland/index.en.md b/content/country/ireland/index.en.md index e175ea109..aedbc4ce8 100644 --- a/content/country/ireland/index.en.md +++ b/content/country/ireland/index.en.md @@ -4,6 +4,9 @@ country: ireland params: operators_without_fip: - Transdev (Luas - Dublin Tram) + border_points: + - ie-gb-rail + - ie-gb-sll --- ## FIP Information diff --git a/content/country/ireland/index.fr.md b/content/country/ireland/index.fr.md index a8957c723..3dff71ca6 100644 --- a/content/country/ireland/index.fr.md +++ b/content/country/ireland/index.fr.md @@ -4,6 +4,9 @@ country: ireland params: operators_without_fip: - Transdev (Luas - Tramway de Dublin) + border_points: + - ie-gb-rail + - ie-gb-sll --- ## Informations FIP diff --git a/content/country/italy/index.de.md b/content/country/italy/index.de.md index dcf97ca08..da7dc4606 100644 --- a/content/country/italy/index.de.md +++ b/content/country/italy/index.de.md @@ -8,10 +8,18 @@ params: - Circumvesuviana - Cumana - European Sleeper - - '[Ferrovie Sud Est](/operator/fs#gültigkeit-fip-tickets "Ferrovie Sud - Est")' + - '[Ferrovie Sud Est](/operator/fs#gültigkeit-fip-tickets "Ferrovie Sud Est")' - Italo / NTV - '[Trenord](/operator/fs#gültigkeit-fip-tickets "Trenord")' + border_points: + - at-it + - it-si + - gr-it + - fr-it + - it-ch + border_points_footnotes: + - "[>] = In Richtung (z. B. Domodossola [> Locarno] = Domodossola ist der Grenzpunkt + in Richtung Locarno)" --- ## FIP Nutzung diff --git a/content/country/italy/index.en.md b/content/country/italy/index.en.md index 2c10698b5..f4c917cd3 100644 --- a/content/country/italy/index.en.md +++ b/content/country/italy/index.en.md @@ -8,10 +8,18 @@ params: - Circumvesuviana - Cumana - European Sleeper - - '[Ferrovie Sud Est](/operator/fs##validity-of-fip-tickets "Ferrovie Sud - Est")' + - '[Ferrovie Sud Est](/operator/fs##validity-of-fip-tickets "Ferrovie Sud Est")' - Italo / NTV - '[Trenord](/operator/fs##validity-of-fip-tickets "Trenord")' + border_points: + - at-it + - it-si + - gr-it + - fr-it + - it-ch + border_points_footnotes: + - "[>] = Towards (e.g., Domodossola [> Locarno] = Domodossola is the border point + towards Locarno)" --- ## FIP Information diff --git a/content/country/italy/index.fr.md b/content/country/italy/index.fr.md index 545eb471c..41a8b2a38 100644 --- a/content/country/italy/index.fr.md +++ b/content/country/italy/index.fr.md @@ -8,10 +8,18 @@ params: - Circumvesuviana - Cumana - European Sleeper - - ’[Ferrovie Sud Est](/operator/fs#validité-des-billets-fip "Ferrovie Sud - Est")’ + - ’[Ferrovie Sud Est](/operator/fs#validité-des-billets-fip "Ferrovie Sud Est")’ - Italo / NTV - ’[Trenord](/operator/fs#validité-des-billets-fip "Trenord")’ + border_points: + - at-it + - it-si + - gr-it + - fr-it + - it-ch + border_points_footnotes: + - "[>] = Vers (par exemple, Domodossola [> Locarno] = Domodossola est le point frontière + vers Locarno)" --- ## Informations FIP diff --git a/content/country/latvia/index.de.md b/content/country/latvia/index.de.md index 68f669fba..87b527c8e 100644 --- a/content/country/latvia/index.de.md +++ b/content/country/latvia/index.de.md @@ -4,6 +4,11 @@ country: latvia params: operators_without_fip: - Latvijas dzelzceļš (LDz) + border_points: + - lv-ee + - lv-ru + - lv-by + - lv-lt --- ## FIP Nutzung diff --git a/content/country/latvia/index.en.md b/content/country/latvia/index.en.md index 41df99505..d77e9cd01 100644 --- a/content/country/latvia/index.en.md +++ b/content/country/latvia/index.en.md @@ -4,6 +4,11 @@ country: latvia params: operators_without_fip: - Latvijas dzelzceļš (LDz) + border_points: + - lv-ee + - lv-ru + - lv-by + - lv-lt --- ## FIP Information diff --git a/content/country/latvia/index.fr.md b/content/country/latvia/index.fr.md index 32cb0b1a7..d97a71897 100644 --- a/content/country/latvia/index.fr.md +++ b/content/country/latvia/index.fr.md @@ -4,6 +4,11 @@ country: latvia params: operators_without_fip: - Latvijas dzelzceļš (LDz) + border_points: + - lv-ee + - lv-ru + - lv-by + - lv-lt --- ## Informations FIP diff --git a/content/country/lithuania/index.de.md b/content/country/lithuania/index.de.md index 94322c755..2720220c2 100644 --- a/content/country/lithuania/index.de.md +++ b/content/country/lithuania/index.de.md @@ -4,6 +4,11 @@ country: lithuania params: operators_without_fip: - Aukštaitijos siaurasis geležinkelis (Museumsbahn) + border_points: + - lv-lt + - lt-by + - lt-pl + - lt-ru --- ## FIP Nutzung diff --git a/content/country/lithuania/index.en.md b/content/country/lithuania/index.en.md index 1c60a836e..c211dd089 100644 --- a/content/country/lithuania/index.en.md +++ b/content/country/lithuania/index.en.md @@ -4,6 +4,11 @@ country: lithuania params: operators_without_fip: - Aukštaitijos siaurasis geležinkelis (heritage railway) + border_points: + - lv-lt + - lt-by + - lt-pl + - lt-ru --- ## FIP Information diff --git a/content/country/lithuania/index.fr.md b/content/country/lithuania/index.fr.md index de9c06815..2d1b49040 100644 --- a/content/country/lithuania/index.fr.md +++ b/content/country/lithuania/index.fr.md @@ -4,6 +4,11 @@ country: lithuania params: operators_without_fip: - Aukštaitijos siaurasis geležinkelis (chemin de fer musée) + border_points: + - lv-lt + - lt-by + - lt-pl + - lt-ru --- ## Informations FIP diff --git a/content/country/luxembourg/index.de.md b/content/country/luxembourg/index.de.md index 0eb72a69e..cd01c6a76 100644 --- a/content/country/luxembourg/index.de.md +++ b/content/country/luxembourg/index.de.md @@ -1,6 +1,11 @@ --- title: Luxemburg country: luxembourg +params: + border_points: + - be-lu + - de-lu + - lu-fr --- ## FIP Nutzung diff --git a/content/country/luxembourg/index.en.md b/content/country/luxembourg/index.en.md index 922540b9c..f2d98a309 100644 --- a/content/country/luxembourg/index.en.md +++ b/content/country/luxembourg/index.en.md @@ -1,6 +1,11 @@ --- title: Luxembourg country: luxembourg +params: + border_points: + - be-lu + - de-lu + - lu-fr --- ## FIP Information diff --git a/content/country/luxembourg/index.fr.md b/content/country/luxembourg/index.fr.md index 4c26d5edc..2eee10894 100644 --- a/content/country/luxembourg/index.fr.md +++ b/content/country/luxembourg/index.fr.md @@ -1,6 +1,11 @@ --- title: Luxembourg country: luxembourg +params: + border_points: + - be-lu + - de-lu + - lu-fr --- ## Informations FIP diff --git a/content/country/montenegro/index.de.md b/content/country/montenegro/index.de.md index 242500108..cfae722e7 100644 --- a/content/country/montenegro/index.de.md +++ b/content/country/montenegro/index.de.md @@ -1,6 +1,9 @@ --- title: Montenegro country: montenegro +params: + border_points: + - me-rs --- ## FIP Nutzung diff --git a/content/country/montenegro/index.en.md b/content/country/montenegro/index.en.md index 4f776fe2d..4823f2207 100644 --- a/content/country/montenegro/index.en.md +++ b/content/country/montenegro/index.en.md @@ -1,6 +1,9 @@ --- title: Montenegro country: montenegro +params: + border_points: + - me-rs --- ## FIP Information diff --git a/content/country/montenegro/index.fr.md b/content/country/montenegro/index.fr.md index 1ed850e28..367b5db97 100644 --- a/content/country/montenegro/index.fr.md +++ b/content/country/montenegro/index.fr.md @@ -1,6 +1,9 @@ --- title: Monténégro country: montenegro +params: + border_points: + - me-rs --- ## Informations FIP diff --git a/content/country/netherlands/index.de.md b/content/country/netherlands/index.de.md index 604a21831..25e0e942d 100644 --- a/content/country/netherlands/index.de.md +++ b/content/country/netherlands/index.de.md @@ -11,6 +11,10 @@ params: - Keolis Nederland - Qbuzz - VIAS Rail + border_points: + - de-nl + - be-nl + - nl-gb-stl --- ## FIP Nutzung diff --git a/content/country/netherlands/index.en.md b/content/country/netherlands/index.en.md index fdc8bbff6..8201a1f52 100644 --- a/content/country/netherlands/index.en.md +++ b/content/country/netherlands/index.en.md @@ -11,6 +11,10 @@ params: - Keolis Nederland - Qbuzz - VIAS Rail + border_points: + - de-nl + - be-nl + - nl-gb-stl --- ## FIP Information diff --git a/content/country/netherlands/index.fr.md b/content/country/netherlands/index.fr.md index b3713e8ff..f9cac9e8b 100644 --- a/content/country/netherlands/index.fr.md +++ b/content/country/netherlands/index.fr.md @@ -11,6 +11,10 @@ params: - Keolis Nederland - Qbuzz - VIAS Rail + border_points: + - de-nl + - be-nl + - nl-gb-stl --- ## Informations FIP diff --git a/content/country/norway/index.de.md b/content/country/norway/index.de.md index 190b56b24..9ce1d2c28 100644 --- a/content/country/norway/index.de.md +++ b/content/country/norway/index.de.md @@ -7,6 +7,8 @@ params: - Flåmbahn - Flytoget Airport Express - SJ Sverige + border_points: + - no-se --- ## FIP Nutzung diff --git a/content/country/norway/index.en.md b/content/country/norway/index.en.md index a53bf86c9..e27e1fc50 100644 --- a/content/country/norway/index.en.md +++ b/content/country/norway/index.en.md @@ -7,6 +7,8 @@ params: - Flåm Railway - Flytoget Airport Express - SJ Sverige + border_points: + - no-se --- ## FIP Information diff --git a/content/country/norway/index.fr.md b/content/country/norway/index.fr.md index 5765a5be2..a2329f85e 100644 --- a/content/country/norway/index.fr.md +++ b/content/country/norway/index.fr.md @@ -7,6 +7,8 @@ params: - Chemin de fer de Flåm - Flytoget Airport Express - SJ Sverige + border_points: + - no-se --- ## Informations FIP diff --git a/content/country/poland/index.de.md b/content/country/poland/index.de.md index b7770ef72..d53d852cb 100644 --- a/content/country/poland/index.de.md +++ b/content/country/poland/index.de.md @@ -9,6 +9,14 @@ params: - Szybka Kolej Miejska w Warszawie - Stowarzyszenie Kolejowych Przewozów Lokalnych (SKPL) - Warszawska Kolej Dojazdowa (WKD) + border_points: + - pl-ru + - lt-pl + - pl-by + - pl-ua + - pl-sk + - cz-pl + - de-pl --- ## FIP Nutzung diff --git a/content/country/poland/index.en.md b/content/country/poland/index.en.md index 3c2639fae..1e0485b37 100644 --- a/content/country/poland/index.en.md +++ b/content/country/poland/index.en.md @@ -9,6 +9,14 @@ params: - Szybka Kolej Miejska w Warszawie - Stowarzyszenie Kolejowych Przewozów Lokalnych (SKPL) - Warszawska Kolej Dojazdowa (WKD) + border_points: + - pl-ru + - lt-pl + - pl-by + - pl-ua + - pl-sk + - cz-pl + - de-pl --- ## FIP Information diff --git a/content/country/poland/index.fr.md b/content/country/poland/index.fr.md index 812f47f51..eba4e8f35 100644 --- a/content/country/poland/index.fr.md +++ b/content/country/poland/index.fr.md @@ -9,6 +9,14 @@ params: - Szybka Kolej Miejska w Warszawie - Stowarzyszenie Kolejowych Przewozów Lokalnych (SKPL) - Warszawska Kolej Dojazdowa (WKD) + border_points: + - pl-ru + - lt-pl + - pl-by + - pl-ua + - pl-sk + - cz-pl + - de-pl --- ## Informations FIP diff --git a/content/country/portugal/index.de.md b/content/country/portugal/index.de.md index 799131546..9f589df90 100644 --- a/content/country/portugal/index.de.md +++ b/content/country/portugal/index.de.md @@ -4,6 +4,11 @@ country: portugal params: operators_without_fip: - Fertagus + border_points: + - pt-es + border_points_footnotes: + - "[>] = In Richtung (z. B. V. Real de Sto António Guardiana [> Ayamonte] = V. Real + de Sto António Guardiana ist der Grenzpunkt in Richtung Ayamonte)" --- ## FIP Nutzung diff --git a/content/country/portugal/index.en.md b/content/country/portugal/index.en.md index ffb0f3ef8..15d1359d0 100644 --- a/content/country/portugal/index.en.md +++ b/content/country/portugal/index.en.md @@ -4,6 +4,11 @@ country: portugal params: operators_without_fip: - Fertagus + border_points: + - pt-es + border_points_footnotes: + - "[>] = Direction (for example: V. Real de Sto António Guardiana [> Ayamonte] = + the border point at V. Real de Sto António Guardiana is oriented towards Ayamonte)" --- ## FIP Information diff --git a/content/country/portugal/index.fr.md b/content/country/portugal/index.fr.md index a09c30d21..bbe28e6aa 100644 --- a/content/country/portugal/index.fr.md +++ b/content/country/portugal/index.fr.md @@ -4,6 +4,11 @@ country: portugal params: operators_without_fip: - Fertagus + border_points: + - pt-es + border_points_footnotes: + - "[>] = Direction (par exemple : V. Real de Sto António Guardiana [> Ayamonte] + = le point frontalier à V. Real de Sto António Guardiana est orienté vers Ayamonte)" --- ## Informations FIP diff --git a/content/country/romania/index.de.md b/content/country/romania/index.de.md index c15705607..3efe59c9e 100644 --- a/content/country/romania/index.de.md +++ b/content/country/romania/index.de.md @@ -9,6 +9,12 @@ params: - SFTRA (Softrans) - TFC (Transferoviar Călători) - TFI (Ferotrans) + border_points: + - ro-ua + - ro-md + - bg-ro + - ro-rs + - hu-ro --- ## FIP Nutzung diff --git a/content/country/romania/index.en.md b/content/country/romania/index.en.md index 737ab555a..8b532c768 100644 --- a/content/country/romania/index.en.md +++ b/content/country/romania/index.en.md @@ -9,6 +9,12 @@ params: - SFTRA (Softrans) - TFC (Transferoviar Călători) - TFI (Ferotrans) + border_points: + - ro-ua + - ro-md + - bg-ro + - ro-rs + - hu-ro --- ## FIP Information diff --git a/content/country/romania/index.fr.md b/content/country/romania/index.fr.md index f16d0a59f..c43a7e98e 100644 --- a/content/country/romania/index.fr.md +++ b/content/country/romania/index.fr.md @@ -9,6 +9,12 @@ params: - SFTRA (Softrans) - TFC (Transferoviar Călători) - TFI (Ferotrans) + border_points: + - ro-ua + - ro-md + - bg-ro + - ro-rs + - hu-ro --- ## Informations FIP diff --git a/content/country/serbia/index.de.md b/content/country/serbia/index.de.md index 6bf9d1df2..9231ac890 100644 --- a/content/country/serbia/index.de.md +++ b/content/country/serbia/index.de.md @@ -4,6 +4,14 @@ country: serbia params: operators_without_fip: - Optima Express + border_points: + - hu-rs + - ro-rs + - bg-rs + - rs-mk + - me-rs + - ba-rs + - rs-hr --- ## FIP Nutzung diff --git a/content/country/serbia/index.en.md b/content/country/serbia/index.en.md index 5d358de4a..ada9f3e50 100644 --- a/content/country/serbia/index.en.md +++ b/content/country/serbia/index.en.md @@ -4,6 +4,14 @@ country: serbia params: operators_without_fip: - Optima Express + border_points: + - hu-rs + - ro-rs + - bg-rs + - rs-mk + - me-rs + - ba-rs + - rs-hr --- ## FIP Information diff --git a/content/country/serbia/index.fr.md b/content/country/serbia/index.fr.md index 2664dabc5..19dcd504b 100644 --- a/content/country/serbia/index.fr.md +++ b/content/country/serbia/index.fr.md @@ -4,6 +4,14 @@ country: serbia params: operators_without_fip: - Optima Express + border_points: + - hu-rs + - ro-rs + - bg-rs + - rs-mk + - me-rs + - ba-rs + - rs-hr --- ## Informations FIP diff --git a/content/country/slovakia/index.de.md b/content/country/slovakia/index.de.md index 9445d3d5f..b393c90e5 100644 --- a/content/country/slovakia/index.de.md +++ b/content/country/slovakia/index.de.md @@ -5,6 +5,10 @@ params: operators_without_fip: - RegioJet - Leo Express + border_points: + - hu-sk-gysev + - hu-sk-mav + - cz-sk --- ## FIP Nutzung diff --git a/content/country/slovakia/index.en.md b/content/country/slovakia/index.en.md index f6305494a..2f9ab7a4a 100644 --- a/content/country/slovakia/index.en.md +++ b/content/country/slovakia/index.en.md @@ -5,6 +5,10 @@ params: operators_without_fip: - RegioJet - Leo Express + border_points: + - hu-sk-gysev + - hu-sk-mav + - cz-sk --- ## FIP Information diff --git a/content/country/slovakia/index.fr.md b/content/country/slovakia/index.fr.md index caa8a8619..461af97ee 100644 --- a/content/country/slovakia/index.fr.md +++ b/content/country/slovakia/index.fr.md @@ -5,6 +5,10 @@ params: operators_without_fip: - RegioJet - Leo Express + border_points: + - hu-sk-gysev + - hu-sk-mav + - cz-sk --- ## Informations FIP diff --git a/content/country/slovenia/index.de.md b/content/country/slovenia/index.de.md index 2b5a61339..c81c78dd1 100644 --- a/content/country/slovenia/index.de.md +++ b/content/country/slovenia/index.de.md @@ -4,6 +4,11 @@ country: slovenia params: operators_without_fip: - Optima Express + border_points: + - it-si + - si-hr + - at-si + - hu-si --- ## FIP Nutzung diff --git a/content/country/slovenia/index.en.md b/content/country/slovenia/index.en.md index f90195ccd..7d71a0dde 100644 --- a/content/country/slovenia/index.en.md +++ b/content/country/slovenia/index.en.md @@ -4,6 +4,11 @@ country: slovenia params: operators_without_fip: - Optima Express + border_points: + - it-si + - si-hr + - at-si + - hu-si --- ## FIP Information diff --git a/content/country/slovenia/index.fr.md b/content/country/slovenia/index.fr.md index 24e4431a5..36c7aafe2 100644 --- a/content/country/slovenia/index.fr.md +++ b/content/country/slovenia/index.fr.md @@ -4,6 +4,11 @@ country: slovenia params: operators_without_fip: - Optima Express + border_points: + - it-si + - si-hr + - at-si + - hu-si --- ## Informations FIP diff --git a/content/country/spain/index.de.md b/content/country/spain/index.de.md index 4acac3f56..d9629f3ca 100644 --- a/content/country/spain/index.de.md +++ b/content/country/spain/index.de.md @@ -6,6 +6,9 @@ params: - Iryo - '[OUIGO](/operator/sncf#Fernverkehr "OUIGO")' - '[Avlo](/operator/renfe#langstrecke "Avlo")' + border_points: + - pt-es + - es-fr --- ## FIP Nutzung diff --git a/content/country/spain/index.en.md b/content/country/spain/index.en.md index cd52d3503..549d3bdc8 100644 --- a/content/country/spain/index.en.md +++ b/content/country/spain/index.en.md @@ -6,6 +6,9 @@ params: - Iryo - OUIGO - '[Avlo](/operator/renfe#long-distance "Avlo")' + border_points: + - pt-es + - es-fr --- ## FIP Information diff --git a/content/country/spain/index.fr.md b/content/country/spain/index.fr.md index 8f5d61327..75d2a5ece 100644 --- a/content/country/spain/index.fr.md +++ b/content/country/spain/index.fr.md @@ -6,6 +6,9 @@ params: - Iryo - OUIGO - ’[Avlo](/operator/renfe#longue-distance "Avlo")’ + border_points: + - pt-es + - es-fr --- ## Informations FIP diff --git a/content/country/switzerland/index.de.md b/content/country/switzerland/index.de.md index e671dcc73..2a9a24bba 100644 --- a/content/country/switzerland/index.de.md +++ b/content/country/switzerland/index.de.md @@ -9,6 +9,14 @@ params: - Gondelbahn Grindelwald – Männlichen (GGM) - Seilbahn Mürren – Allmendhubel (SMA) - Luftseilbahn Stechelberg (Mürren – Schilthorn) (LSMS) + border_points: + - de-ch + - at-ch + - it-ch + - fr-ch + border_points_footnotes: + - "[>] = In Richtung (z. B. Locarno [> Domodossola] = Locarno ist der Grenzpunkt + in Richtung Domodossola)" --- ## FIP Nutzung diff --git a/content/country/switzerland/index.en.md b/content/country/switzerland/index.en.md index 14a7138c0..c7c0023d5 100644 --- a/content/country/switzerland/index.en.md +++ b/content/country/switzerland/index.en.md @@ -9,6 +9,14 @@ params: - Gondelbahn Grindelwald – Männlichen (GGM) - Seilbahn Mürren – Allmendhubel (SMA) - Luftseilbahn Stechelberg (Mürren – Schilthorn) (LSMS) + border_points: + - de-ch + - at-ch + - it-ch + - fr-ch + border_points_footnotes: + - "[>] = Direction (e.g. Locarno [> Domodossola] = Locarno is the border point towards + Domodossola)" --- ## FIP Information diff --git a/content/country/switzerland/index.fr.md b/content/country/switzerland/index.fr.md index 0fa8472f0..2124d39d5 100644 --- a/content/country/switzerland/index.fr.md +++ b/content/country/switzerland/index.fr.md @@ -9,6 +9,14 @@ params: - Gondelbahn Grindelwald – Männlichen (GGM) - Seilbahn Mürren – Allmendhubel (SMA) - Luftseilbahn Stechelberg (Mürren – Schilthorn) (LSMS) + border_points: + - de-ch + - at-ch + - it-ch + - fr-ch + border_points_footnotes: + - "[>] = En direction de (par exemple, Locarno [> Domodossola] = Locarno est le + point frontière en direction de Domodossola)" --- ## Informations FIP diff --git a/content/country/united-kingdom/index.de.md b/content/country/united-kingdom/index.de.md index f20e269cb..d590105df 100644 --- a/content/country/united-kingdom/index.de.md +++ b/content/country/united-kingdom/index.de.md @@ -17,8 +17,14 @@ params: - 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) + - Wightlink ferry (Portsmouth Harbour nach Ryde Pier Head station auf der Isle of + Wight) + border_points: + - nl-gb-stl + - gb-eurostar + - ie-gb-rail + - ie-gb-sll + - gb-gb-sll --- diff --git a/content/country/united-kingdom/index.en.md b/content/country/united-kingdom/index.en.md index c6de82a10..75ff5cba4 100644 --- a/content/country/united-kingdom/index.en.md +++ b/content/country/united-kingdom/index.en.md @@ -17,8 +17,13 @@ params: - 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) + - Wightlink ferry (Portsmouth Harbour to Ryde Pier Head station on the Isle of Wight) + border_points: + - nl-gb-stl + - gb-eurostar + - ie-gb-rail + - ie-gb-sll + - gb-gb-sll --- diff --git a/content/country/united-kingdom/index.fr.md b/content/country/united-kingdom/index.fr.md index 8d40a8bed..08700ca63 100644 --- a/content/country/united-kingdom/index.fr.md +++ b/content/country/united-kingdom/index.fr.md @@ -17,8 +17,13 @@ params: - 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) + - Wightlink ferry (Portsmouth Harbour à Ryde Pier Head station sur l’île de Wight) + border_points: + - nl-gb-stl + - gb-eurostar + - ie-gb-rail + - ie-gb-sll + - gb-gb-sll --- diff --git a/layouts/_partials/border-points/rows.html b/layouts/_partials/border-points/rows.html index 9ced6cbda..c714d66e6 100644 --- a/layouts/_partials/border-points/rows.html +++ b/layouts/_partials/border-points/rows.html @@ -1,21 +1,12 @@ {{- $country := .country -}} {{- $page := .page -}} -{{- $data := partialCached "border-points/data" . site.Language.Lang -}} -{{- $borders := $data.borders | default slice -}} +{{- $borders := partialCached "border-points/data" . site.Language.Lang | default slice -}} -{{- $ordered := $borders -}} -{{- with index $data.countries $country -}} - {{- with .order -}} - {{- $ordered = slice -}} - {{- range . -}} - {{- $ordered = $ordered | append (where $borders "id" .) -}} - {{- end -}} - {{- end -}} -{{- end -}} +{{- $order := $page.Params.border_points | default slice -}} {{- $rows := slice -}} -{{- range $ordered -}} - {{- $border := . -}} +{{- range $order -}} + {{- $border := index (where $borders "id" .) 0 -}} {{- $own := "" -}} {{- range $key := slice "a" "b" -}} {{- if not $own -}} diff --git a/layouts/_partials/border-points/table.html b/layouts/_partials/border-points/table.html index 92dd8ae3f..905bb3b8d 100644 --- a/layouts/_partials/border-points/table.html +++ b/layouts/_partials/border-points/table.html @@ -1,6 +1,5 @@ {{- $country := .country -}} {{- $page := .page -}} -{{- $data := partialCached "border-points/data" . site.Language.Lang -}} {{- $rows := partial "border-points/rows" . -}} {{- with $rows -}} @@ -21,14 +20,12 @@
- {{- with index $data.countries $country -}} - {{- with .footnotes -}} -

- {{- range $index, $footnote := . -}} - {{- if $index }}
{{ end -}} - {{ $footnote }} - {{- end -}} -

- {{- end -}} + {{- with $page.Params.border_points_footnotes -}} +

+ {{- range $index, $footnote := . -}} + {{- if $index }}
{{ end -}} + {{ $footnote }} + {{- end -}} +

{{- end -}} {{- end -}} diff --git a/layouts/_partials/neighboringOperators.html b/layouts/_partials/neighboringOperators.html index 9352bba08..fe6f1c759 100644 --- a/layouts/_partials/neighboringOperators.html +++ b/layouts/_partials/neighboringOperators.html @@ -1,8 +1,8 @@ {{- $operator := .page.File.ContentBaseName -}} -{{- $data := partialCached "border-points/data" . site.Language.Lang -}} +{{- $borders := partialCached "border-points/data" . site.Language.Lang -}} {{- $ids := slice -}} -{{- range $data.borders -}} +{{- range $borders -}} {{- $border := . -}} {{- range $key := slice "a" "b" -}} {{- $match := false -}} diff --git a/layouts/admin/section.cmsconfig.yml b/layouts/admin/section.cmsconfig.yml index 4542085e3..da71fd2e0 100644 --- a/layouts/admin/section.cmsconfig.yml +++ b/layouts/admin/section.cmsconfig.yml @@ -231,6 +231,37 @@ collections: name: "country" widget: "string" i18n: duplicate + - label: "Parameters" + name: "params" + widget: "object" + i18n: true + collapsed: true + summary: "Operators & Border Points" + fields: + - label: "Operators without FIP" + name: "operators_without_fip" + widget: "list" + required: false + i18n: duplicate + hint: "List of operators in this country that do not accept FIP." + - label: "Border Points" + name: "border_points" + widget: "relation" + collection: "_singletons" + file: "borderpoints" + value_field: "{{"{{"}}borders.*.id}}" + display_fields: ["{{"{{"}}borders.*.id}}"] + search_fields: ["{{"{{"}}borders.*.id}}"] + multiple: true + required: false + i18n: duplicate + hint: 'Border IDs in clockwise order, starting in the north of the country. To add or edit borders, see the [Border Points](/admin/#/collections/_singletons/entries/borderpoints) singleton.' + - label: "Border Points Footnotes" + name: "border_points_footnotes" + widget: "list" + required: false + i18n: true + hint: "Optional footnotes shown below the border point table." - label: "Body" name: "body" widget: "markdown" @@ -837,35 +868,10 @@ singletons: file: "content/country/borderpoints.{{"{{"}}locale}}.yaml" i18n: true fields: - - label: "Countries" - name: "countries" - widget: "list" - i18n: true - collapsed: true - summary: "{{"{{"}}fields.id}}" - hint: "Row order and footnotes of the border point table per country." - fields: - - label: "Country" - name: "id" - widget: "relation" - collection: "country" - search_fields: ["title"] - value_field: "country" - display_fields: ["title"] - i18n: duplicate - - label: "Row Order" - name: "order" - widget: "list" - i18n: duplicate - hint: "Border IDs in clockwise order, starting in the north of the country." - - label: "Footnotes" - name: "footnotes" - widget: "list" - required: false - i18n: true - label: "Borders" name: "borders" widget: "list" + root: true i18n: true collapsed: true summary: "{{"{{"}}fields.id}}" From 1f4f40d36e79a7af54da270c7148ce6153d1c653 Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Thu, 8 Oct 2026 22:29:19 +0200 Subject: [PATCH 13/16] refactor: bake in sort order, drop sort flag from border points --- content/country/borderpoints.de.yaml | 29 ++++++++++------------- content/country/borderpoints.en.yaml | 29 ++++++++++------------- content/country/borderpoints.fr.yaml | 29 ++++++++++------------- layouts/_partials/border-points/rows.html | 3 --- layouts/admin/section.cmsconfig.yml | 9 +------ 5 files changed, 37 insertions(+), 62 deletions(-) diff --git a/content/country/borderpoints.de.yaml b/content/country/borderpoints.de.yaml index d7dd40760..3ee6b58c9 100644 --- a/content/country/borderpoints.de.yaml +++ b/content/country/borderpoints.de.yaml @@ -58,7 +58,6 @@ - Hegyeshalom (Gr) - Sopron - id: at-si - sort: true a: country: id: austria @@ -71,8 +70,8 @@ - id: sz points: - "Bleiburg (Gr) (Slowenisch: Pliberk)" - - "Spielfeld-Strass (Gr) / Spielfeld (Gr) (Slowenisch: Špilje)" - "Rosenbach (Gr) / Jesenice (Gr) (Deutsch: Assling)" + - "Spielfeld-Strass (Gr) / Spielfeld (Gr) (Slowenisch: Špilje)" - id: at-it a: country: @@ -103,7 +102,6 @@ - Buchs SG - St. Margrethen - id: at-de - sort: true a: country: id: austria @@ -115,12 +113,12 @@ operators: - id: db points: + - Kufstein + - Lindau-Reutin + - Mittenwald (Gr) - Passau Hbf - Salzburg Hbf (im NV bis Salzburg Liefering) - Simbach am Inn - - Kufstein - - Mittenwald (Gr) - - Lindau-Reutin - id: be-nl a: country: @@ -307,7 +305,6 @@ - Nemšová (Gr) - Skalica na Slovensku (Gr) - id: cz-de - sort: true a: country: id: czechia @@ -319,19 +316,19 @@ operators: - id: db points: - - Selb-Plößberg (Gr) / Aš (Gr) - "Bayerisch Eisenstein (tschechisch: Bavorská Železná ruda)" - Cheb (Gr) - - Sebnitz (Gr) / Dolní Poustevna (Gr) - Furth im Wald (Gr) - - Zittau (Gr) + - Kraslice (Gr) - Potůčky (Gr) - - Schöna (Gr) - Rumburk (Gr) + - Schöna (Gr) + - Sebnitz (Gr) / Dolní Poustevna (Gr) + - Selb-Plößberg (Gr) / Aš (Gr) - Vejprty (Gr) - Vojtanov (Gr) - - Kraslice (Gr) - Waidhaus (Gr) + - Zittau (Gr) - id: dk-se a: country: @@ -377,7 +374,6 @@ - Lübeck-Travemünde Skandinavienkai - Sassnitz (Gr) - id: de-pl - sort: true a: country: id: germany @@ -703,7 +699,6 @@ - Piene (fr) - Ventimiglia (fr) - id: it-ch - sort: true a: country: id: italy @@ -719,13 +714,13 @@ points: - Chiasso - Domodossola - - Iselle transito [> Brig] - - Iselle di Trasquera [> Domodossola] - Domodossola [> Locarno] + - Iselle di Trasquera [> Domodossola] + - Iselle transito [> Brig] - Locarno [> Domodossola] - - Porto Ceresio [> Lugano] - Lugano [> Porto Ceresio] - Pino transito + - Porto Ceresio [> Lugano] - Tirano - id: fr-ch a: diff --git a/content/country/borderpoints.en.yaml b/content/country/borderpoints.en.yaml index 3604a66a7..3c40b6f24 100644 --- a/content/country/borderpoints.en.yaml +++ b/content/country/borderpoints.en.yaml @@ -58,7 +58,6 @@ - Hegyeshalom (Gr) - Sopron - id: at-si - sort: true a: country: id: austria @@ -71,8 +70,8 @@ - id: sz points: - "Bleiburg (Gr) (Slovenian: Pliberk)" - - "Spielfeld-Strass (Gr) / Spielfeld (Gr) (Slovenian: Špilje)" - "Rosenbach (Gr) / Jesenice (Gr) (German: Assling)" + - "Spielfeld-Strass (Gr) / Spielfeld (Gr) (Slovenian: Špilje)" - id: at-it a: country: @@ -103,7 +102,6 @@ - Buchs SG - St. Margrethen - id: at-de - sort: true a: country: id: austria @@ -115,12 +113,12 @@ operators: - id: db points: + - Kufstein + - Lindau-Reutin + - Mittenwald (Gr) - Passau Hbf - Salzburg Hbf (local trains to Salzburg Liefering) - Simbach am Inn - - Kufstein - - Mittenwald (Gr) - - Lindau-Reutin - id: be-nl a: country: @@ -307,7 +305,6 @@ - Nemšová (Gr) - Skalica na Slovensku (Gr) - id: cz-de - sort: true a: country: id: czechia @@ -319,19 +316,19 @@ operators: - id: db points: - - Selb-Plößberg(Gr) / Aš (Gr) - "Bayerisch Eisenstein (Czech: Bavorská Železná ruda)" - Cheb (Gr) - - Sebnitz (Gr) / Dolní Poustevna (Gr) - Furth i Wald (Gr) - - Zittau (Gr) + - Kraslice (Gr) - Potucky (ČD) - - Schöna (Gr) - Rumburk (Gr) + - Schöna (Gr) + - Sebnitz (Gr) / Dolní Poustevna (Gr) + - Selb-Plößberg(Gr) / Aš (Gr) - Vejprty (Gr) - Vojtanov (Gr) - - Kraslice (Gr) - Waidhaus (Gr) + - Zittau (Gr) - id: dk-se a: country: @@ -377,7 +374,6 @@ - Lübeck-Travemünde Skandinavienkai - Sassnitz (Gr) - id: de-pl - sort: true a: country: id: germany @@ -703,7 +699,6 @@ - Piene (fr) - Ventimiglia (fr) - id: it-ch - sort: true a: country: id: italy @@ -719,13 +714,13 @@ points: - Chiasso - Domodossola - - Iselle transito [> Brig] - - Iselle di Trasquera [> Domodossola] - Domodossola [> Locarno] + - Iselle di Trasquera [> Domodossola] + - Iselle transito [> Brig] - Locarno [> Domodossola] - - Porto Ceresio [> Lugano] - Lugano [> Porto Ceresio] - Pino transito + - Porto Ceresio [> Lugano] - Tirano - id: fr-ch a: diff --git a/content/country/borderpoints.fr.yaml b/content/country/borderpoints.fr.yaml index 062c4850e..1827e1510 100644 --- a/content/country/borderpoints.fr.yaml +++ b/content/country/borderpoints.fr.yaml @@ -58,7 +58,6 @@ - Hegyeshalom (Gr) - Sopron - id: at-si - sort: true a: country: id: austria @@ -71,8 +70,8 @@ - id: sz points: - "Bleiburg (Gr) (slovène : Pliberk)" - - "Spielfeld-Strass (Gr) / Spielfeld (Gr) (slovène : Špilje)" - "Rosenbach (Gr) / Jesenice (Gr) (allemand : Assling)" + - "Spielfeld-Strass (Gr) / Spielfeld (Gr) (slovène : Špilje)" - id: at-it a: country: @@ -103,7 +102,6 @@ - Buchs SG - St. Margrethen - id: at-de - sort: true a: country: id: austria @@ -115,12 +113,12 @@ operators: - id: db points: + - Kufstein + - Lindau-Reutin + - Mittenwald (Gr) - Passau Hbf - Salzbourg Hbf (trains régionaux vers Salzburg Liefering) - Simbach am Inn - - Kufstein - - Mittenwald (Gr) - - Lindau-Reutin - id: be-nl a: country: @@ -307,7 +305,6 @@ - Nemšová (Gr) - Skalica na Slovensku (Gr) - id: cz-de - sort: true a: country: id: czechia @@ -319,19 +316,19 @@ operators: - id: db points: - - Selb-Plößberg (Gr) / Aš (Gr) - "Bayerisch Eisenstein (tchèque : Bavorská Železná ruda)" - Cheb (Gr) - - Sebnitz (Gr) / Dolní Poustevna (Gr) - Furth im Wald (Gr) - - Zittau (Gr) + - Kraslice (Gr) - Potůčky (Gr) - - Schöna (Gr) - Rumburk (Gr) + - Schöna (Gr) + - Sebnitz (Gr) / Dolní Poustevna (Gr) + - Selb-Plößberg (Gr) / Aš (Gr) - Vejprty (Gr) - Vojtanov (Gr) - - Kraslice (Gr) - Waidhaus (Gr) + - Zittau (Gr) - id: dk-se a: country: @@ -377,7 +374,6 @@ - Lübeck-Travemünde Skandinavienkai - Sassnitz (Gr) - id: de-pl - sort: true a: country: id: germany @@ -703,7 +699,6 @@ - Piene (fr) - Ventimiglia (fr) - id: it-ch - sort: true a: country: id: italy @@ -719,13 +714,13 @@ points: - Chiasso - Domodossola - - Iselle transito [> Brig] - - Iselle di Trasquera [> Domodossola] - Domodossola [> Locarno] + - Iselle di Trasquera [> Domodossola] + - Iselle transito [> Brig] - Locarno [> Domodossola] - - Porto Ceresio [> Lugano] - Lugano [> Porto Ceresio] - Pino transito + - Porto Ceresio [> Lugano] - Tirano - id: fr-ch a: diff --git a/layouts/_partials/border-points/rows.html b/layouts/_partials/border-points/rows.html index c714d66e6..a24c426fd 100644 --- a/layouts/_partials/border-points/rows.html +++ b/layouts/_partials/border-points/rows.html @@ -19,9 +19,6 @@ {{- with $own -}} {{- $other := cond (eq . "a") "b" "a" -}} {{- $points := $border.points | default slice -}} - {{- if $border.sort -}} - {{- $points = sort $points -}} - {{- end -}} {{- with $points -}} {{- $rows = $rows | append (dict "label" (partial "border-points/side-label" (dict "side" (index $border $other) "page" $page)) diff --git a/layouts/admin/section.cmsconfig.yml b/layouts/admin/section.cmsconfig.yml index da71fd2e0..6d8b62f58 100644 --- a/layouts/admin/section.cmsconfig.yml +++ b/layouts/admin/section.cmsconfig.yml @@ -881,14 +881,7 @@ singletons: name: "id" widget: "string" i18n: duplicate - hint: 'Unique identifier, e.g. "at-cz". Referenced in the row order above.' - - label: "Sorting" - name: "sort" - widget: "boolean" - default: false - required: false - i18n: duplicate - hint: "Sort the border points of this border alphabetically." + hint: 'Unique identifier, e.g. "at-cz". Referenced in the Border Points field on each Country page.' - label: "Side A" name: "a" widget: "object" From d39bcf95e5530350c2c1f99281c05e5a1eaa6407 Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Thu, 8 Oct 2026 22:38:43 +0200 Subject: [PATCH 14/16] feat: add border-points editor component to CMS --- layouts/admin/section.cmsconfig.yml | 1 + static/admin/shortcodes.js | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/layouts/admin/section.cmsconfig.yml b/layouts/admin/section.cmsconfig.yml index 6d8b62f58..0c162bae1 100644 --- a/layouts/admin/section.cmsconfig.yml +++ b/layouts/admin/section.cmsconfig.yml @@ -274,6 +274,7 @@ collections: - "dialog" - "float-image" - "wip" + - "border-points" - "identify-operator" - "columns" - "footnote" diff --git a/static/admin/shortcodes.js b/static/admin/shortcodes.js index 859f81938..fd4f684e5 100644 --- a/static/admin/shortcodes.js +++ b/static/admin/shortcodes.js @@ -885,6 +885,24 @@ }, }); + CMS.registerEditorComponent({ + id: "border-points", + label: "Border Points", + fields: [], + pattern: selfClosingPattern("border-points"), + fromBlock: function () { + return {}; + }, + toBlock: makeToBlock("border-points", { + bracket: "<", + fields: [], + bodyMode: "none", + }), + toPreview: function () { + return ""; + }, + }); + var updateFields = [ { name: "date", From b15c8e57d1fbc40c75435ab08dd1e0cf1344237f Mon Sep 17 00:00:00 2001 From: MoritzWeber Date: Thu, 8 Oct 2026 22:54:52 +0200 Subject: [PATCH 15/16] refactor: pass icon directly to expander partial instead of variant --- layouts/_partials/expander.html | 5 +---- layouts/_shortcodes/border-points.html | 2 +- layouts/_shortcodes/expander.html | 2 +- layouts/_shortcodes/faq.html | 2 +- static/admin/shortcodes.js | 12 ++++++------ 5 files changed, 10 insertions(+), 13 deletions(-) diff --git a/layouts/_partials/expander.html b/layouts/_partials/expander.html index 3031196b5..6dd698838 100644 --- a/layouts/_partials/expander.html +++ b/layouts/_partials/expander.html @@ -1,10 +1,7 @@ -{{ $iconMapping := dict "border" "share_location" "info" "info" "faq" "help" }} - -
- {{- partial "icon" (index $iconMapping .Variant) -}} + {{- partial "icon" .Icon -}} Date: Thu, 8 Oct 2026 22:56:13 +0200 Subject: [PATCH 16/16] fix: rename border side summary to Country & Operators --- layouts/admin/section.cmsconfig.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/layouts/admin/section.cmsconfig.yml b/layouts/admin/section.cmsconfig.yml index 0c162bae1..1cfcbeef4 100644 --- a/layouts/admin/section.cmsconfig.yml +++ b/layouts/admin/section.cmsconfig.yml @@ -888,14 +888,14 @@ singletons: widget: "object" i18n: true collapsed: true - summary: "Countries & Operators" + summary: "Country & Operators" fields: *border_side - label: "Side B" name: "b" widget: "object" i18n: true collapsed: true - summary: "Countries & Operators" + summary: "Country & Operators" fields: *border_side - label: "Border Points" name: "points"