summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2020-05-02 09:59:01 +0200
committerDaniel Friesel <derf@finalrewind.org>2020-05-02 09:59:01 +0200
commitdc96f354eb26430087f5a5359346e429f4bab736 (patch)
tree6d8c1a91d1850b3eab0c492f10f96c0f3b671cd5
parent86c30dcd6b010f143f05bae367b8acb84e0f6cee (diff)
Sort EFA services lexically by acronym
-rw-r--r--lib/Travel/Status/DE/EFA.pm127
-rwxr-xr-xscripts/check-efa-urls26
2 files changed, 78 insertions, 75 deletions
diff --git a/lib/Travel/Status/DE/EFA.pm b/lib/Travel/Status/DE/EFA.pm
index 71775a4..bdcbc7e 100644
--- a/lib/Travel/Status/DE/EFA.pm
+++ b/lib/Travel/Status/DE/EFA.pm
@@ -522,31 +522,23 @@ sub results {
# static
sub get_efa_urls {
+
+ # sorted lexically by shortname
return (
{
+ url => 'https://bsvg.efa.de/bsvagstd/XML_DM_REQUEST',
+ name => 'Braunschweiger Verkehrs-GmbH',
+ shortname => 'BSVG',
+ },
+ {
url => 'https://www.ding.eu/ding3/XSLT_DM_REQUEST',
name => 'Donau-Iller Nahverkehrsverbund',
shortname => 'DING',
},
-
- # HTTPS not supported
- {
- url => 'http://efa.svv-info.at/sbs/XSLT_DM_REQUEST',
- name => 'Salzburger Verkehrsverbund',
- shortname => 'SVV',
- },
- {
- url => 'https://efa.vor.at/wvb/XSLT_DM_REQUEST',
- name => 'Verkehrsverbund Ost-Region',
- shortname => 'VOR',
- encoding => 'iso-8859-15',
- },
-
- # HTTPS not supported
{
- url => 'http://fahrplan.verbundlinie.at/stv/XSLT_DM_REQUEST',
- name => 'Verkehrsverbund Steiermark',
- shortname => 'Verbundlinie',
+ url => 'https://projekte.kvv-efa.de/sl3-alone/XSLT_DM_REQUEST',
+ name => 'Karlsruher Verkehrsverbund',
+ shortname => 'KVV',
},
{
url => 'https://www.linzag.at/static/XSLT_DM_REQUEST',
@@ -555,43 +547,52 @@ sub get_efa_urls {
encoding => 'iso-8859-15',
},
{
- url => 'https://efa.vgn.de/vgnExt_oeffi/XML_DM_REQUEST',
- name => 'Verkehrsverbund Grossraum Nuernberg',
- shortname => 'VGN',
+ url => 'https://efa.mvv-muenchen.de/mobile/XSLT_DM_REQUEST',
+ name => 'Münchner Verkehrs- und Tarifverbund',
+ shortname => 'MVV',
},
{
- url => 'https://efa.vrr.de/vrr/XSLT_DM_REQUEST',
- name => 'Verkehrsverbund Rhein-Ruhr',
- shortname => 'VRR',
+ url => 'https://www.efa-bw.de/nvbw/XSLT_DM_REQUEST',
+ name => 'Nahverkehrsgesellschaft Baden-Württemberg',
+ shortname => 'NVBW',
},
+
+ # HTTPS not supported
{
- url => 'https://app.vrr.de/standard/XML_DM_REQUEST',
- name => 'Verkehrsverbund Rhein-Ruhr (alternative)',
- shortname => 'VRR2',
+ url => 'http://efa.svv-info.at/sbs/XSLT_DM_REQUEST',
+ name => 'Salzburger Verkehrsverbund',
+ shortname => 'SVV',
},
+
+ # HTTPS: invalid certificate
{
- url => 'https://www2.vvs.de/vvs/XSLT_DM_REQUEST',
- name => 'Verkehrsverbund Stuttgart',
- shortname => 'VVS',
+ url => 'http://www.travelineeastmidlands.co.uk/em/XSLT_DM_REQUEST',
+ name => 'Traveline East Midlands',
+ shortname => 'TLEM',
+ },
+ {
+ url => 'https://efa.vagfr.de/vagfr3/XSLT_DM_REQUEST',
+ name => 'Freiburger Verkehrs AG',
+ shortname => 'VAG',
},
- # HTTPS not supported
+ # HTTPS: unsupported protocol
{
- url => 'http://efa.vvo-online.de:8080/dvb/XSLT_DM_REQUEST',
- name => 'Verkehrsverbund Oberelbe',
- shortname => 'VVO',
+ url => 'http://mobil.vbl.ch/vblmobil/XML_DM_REQUEST',
+ name => 'Verkehrsbetriebe Luzern',
+ shortname => 'VBL',
},
# HTTPS not supported
{
- url => 'http://fahrplanauskunft.vrn.de/vrn/XML_DM_REQUEST',
- name => 'Verkehrsverbund Rhein-Neckar',
- shortname => 'VRN',
+ url => 'http://fahrplan.verbundlinie.at/stv/XSLT_DM_REQUEST',
+ name => 'Verkehrsverbund Steiermark',
+ shortname => 'Verbundlinie',
},
{
- url => 'https://www.efa-bw.de/nvbw/XSLT_DM_REQUEST',
- name => 'Nahverkehrsgesellschaft Baden-Württemberg',
- shortname => 'NVBW',
+ url => 'https://efa.vgn.de/vgnExt_oeffi/XML_DM_REQUEST',
+ name => 'Verkehrsverbund Grossraum Nuernberg',
+ shortname => 'VGN',
},
# HTTPS: certificate verification fails
@@ -601,39 +602,41 @@ sub get_efa_urls {
shortname => 'VMV',
},
{
- url => 'https://projekte.kvv-efa.de/sl3-alone/XSLT_DM_REQUEST',
- name => 'Karlsruher Verkehrsverbund',
- shortname => 'KVV',
+ url => 'https://efa.vor.at/wvb/XSLT_DM_REQUEST',
+ name => 'Verkehrsverbund Ost-Region',
+ shortname => 'VOR',
+ encoding => 'iso-8859-15',
},
+
+ # HTTPS not supported
{
- url => 'https://efa.mvv-muenchen.de/mobile/XSLT_DM_REQUEST',
- name => 'Münchner Verkehrs- und Tarifverbund',
- shortname => 'MVV',
+ url => 'http://fahrplanauskunft.vrn.de/vrn/XML_DM_REQUEST',
+ name => 'Verkehrsverbund Rhein-Neckar',
+ shortname => 'VRN',
},
-
- # HTTPS: invalid certificate
{
- url => 'http://www.travelineeastmidlands.co.uk/em/XSLT_DM_REQUEST',
- name => 'Traveline East Midlands',
- shortname => 'TLEM',
+ url => 'https://efa.vrr.de/vrr/XSLT_DM_REQUEST',
+ name => 'Verkehrsverbund Rhein-Ruhr',
+ shortname => 'VRR',
},
-
- # HTTPS: unsupported protocol
{
- url => 'http://mobil.vbl.ch/vblmobil/XML_DM_REQUEST',
- name => 'Verkehrsbetriebe Luzern',
- shortname => 'VBL',
+ url => 'https://app.vrr.de/standard/XML_DM_REQUEST',
+ name => 'Verkehrsverbund Rhein-Ruhr (alternative)',
+ shortname => 'VRR2',
},
+
+ # HTTPS not supported
{
- url => 'https://bsvg.efa.de/bsvagstd/XML_DM_REQUEST',
- name => 'Braunschweiger Verkehrs-GmbH',
- shortname => 'BSVG',
+ url => 'http://efa.vvo-online.de:8080/dvb/XSLT_DM_REQUEST',
+ name => 'Verkehrsverbund Oberelbe',
+ shortname => 'VVO',
},
{
- url => 'https://efa.vagfr.de/vagfr3/XSLT_DM_REQUEST',
- name => 'Freiburger Verkehrs AG',
- shortname => 'VAG',
+ url => 'https://www2.vvs.de/vvs/XSLT_DM_REQUEST',
+ name => 'Verkehrsverbund Stuttgart',
+ shortname => 'VVS',
},
+
);
}
diff --git a/scripts/check-efa-urls b/scripts/check-efa-urls
index eb18b9f..6ae1473 100755
--- a/scripts/check-efa-urls
+++ b/scripts/check-efa-urls
@@ -2,25 +2,25 @@
export PERL5LIB=lib
-checks="DING Ulm Hbf
+checks="BSVG Braunschweig Hbf
+DING Ulm Hbf
+KVV Karlsruhe Hbf
+LinzAG Linz Hbf
+MVV München Hackerbrücke
+NVBW Stuttgart Hbf (A.-Klett-Pl.)
SVV Salzburg Hbf
-VOR Wien Hbf
+TLEM London Waterloo East
+VAG Schallstadt Bf
+VBL Luzern Bf
Verbundlinie Graz Hbf
-LinzAG Linz Hbf
VGN Nürnberg Hbf
+VMV Schwerin Hbf
+VOR Wien Hbf
+VRN Mannheim Hbf
VRR Essen Hbf
VRR2 Essen Hbf
-VVS Stuttgart Schwabstraße
VVO Dresden Hbf
-VRN Mannheim Hbf
-NVBW Stuttgart Hbf (A.-Klett-Pl.)
-VMV Schwerin Hbf
-KVV Karlsruhe Hbf
-TLEM London Waterloo East
-VBL Luzern Bf
-BSVG Braunschweig Hbf
-VAG Schallstadt Bf
-MVV München Hackerbrücke"
+VVS Stuttgart Schwabstraße"
echo $checks | while read service name place; do
echo -n "${service} ... "