From 1f14e32f2a24a34bafafd93b77c52f3e3f9cb0f7 Mon Sep 17 00:00:00 2001
From: Birte Kristina Friesel <derf@finalrewind.org>
Date: Mon, 2 Oct 2023 04:43:27 +0200
Subject: efa.vrr.de/vrr is dead; switch to app.vrr.de/vrrstd as default

---
 bin/efa                      |  2 +-
 lib/Travel/Routing/DE/EFA.pm | 11 +++--------
 lib/Travel/Routing/DE/VRR.pm |  2 +-
 t/20-vrr.t                   |  6 +++---
 4 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/bin/efa b/bin/efa
index 01e96e2..ecdac9c 100755
--- a/bin/efa
+++ b/bin/efa
@@ -15,7 +15,7 @@ use List::Util   qw(first);
 our $VERSION = '2.22';
 my $ignore_info;
 my $efa;
-my $efa_url = 'http://efa.vrr.de/vrr/XSLT_TRIP_REQUEST2';
+my $efa_url = 'https://app.vrr.de/vrrstd/XML_TRIP_REQUEST2';
 my ( @from, @to, @via, $from_type, $to_type, $via_type );
 my $opt = {
 	'efa-url'     => \$efa_url,
diff --git a/lib/Travel/Routing/DE/EFA.pm b/lib/Travel/Routing/DE/EFA.pm
index a23524b..c14af4c 100644
--- a/lib/Travel/Routing/DE/EFA.pm
+++ b/lib/Travel/Routing/DE/EFA.pm
@@ -921,20 +921,15 @@ sub get_efa_urls {
 			name      => 'Verkehrsverbund Rhein-Neckar',
 			shortname => 'VRN',
 		},
-		{
-			url       => 'https://efa.vrr.de/vrr/XSLT_TRIP_REQUEST2',
-			name      => 'Verkehrsverbund Rhein-Ruhr',
-			shortname => 'VRR',
-		},
 		{
 			url       => 'https://app.vrr.de/vrrstd/XML_TRIP_REQUEST2',
 			name      => 'Verkehrsverbund Rhein-Ruhr (alternative)',
-			shortname => 'VRR2',
+			shortname => 'VRR',
 		},
 		{
 			url       => 'https://efa.vrr.de/rbgstd3/XSLT_TRIP_REQUEST2',
 			name      => 'Verkehrsverbund Rhein-Ruhr (alternative alternative)',
-			shortname => 'VRR3',
+			shortname => 'VRR2',
 		},
 		{
 			url       => 'https://efa.vvo-online.de/VMSSL3/XSLT_TRIP_REQUEST2',
@@ -962,7 +957,7 @@ Travel::Routing::DE::EFA - unofficial interface to EFA-based itinerary services
 	use Travel::Routing::DE::EFA;
 
 	my $efa = Travel::Routing::DE::EFA->new(
-		efa_url     => 'http://efa.vrr.de/vrr/XSLT_TRIP_REQUEST2',
+		efa_url     => 'https://app.vrr.de/vrrstd/XML_TRIP_REQUEST2';',
 		origin      => [ 'Essen',    'HBf' ],
 		destination => [ 'Duisburg', 'HBf' ],
 	);
diff --git a/lib/Travel/Routing/DE/VRR.pm b/lib/Travel/Routing/DE/VRR.pm
index 998d86a..a1aad62 100644
--- a/lib/Travel/Routing/DE/VRR.pm
+++ b/lib/Travel/Routing/DE/VRR.pm
@@ -11,7 +11,7 @@ use parent 'Travel::Routing::DE::EFA';
 sub new {
 	my ( $class, %opt ) = @_;
 
-	$opt{efa_url} = 'http://efa.vrr.de/vrr/XSLT_TRIP_REQUEST2';
+	$opt{efa_url} = 'https://app.vrr.de/vrrstd/XML_TRIP_REQUEST2';
 
 	return $class->SUPER::new(%opt);
 }
diff --git a/t/20-vrr.t b/t/20-vrr.t
index e425820..4db9036 100644
--- a/t/20-vrr.t
+++ b/t/20-vrr.t
@@ -13,11 +13,11 @@ require_ok('Travel::Routing::DE::VRR');
 
 sub efa_conf {
 	my $ret = {
-		efa_url     => 'http://efa.vrr.de/vrr/XSLT_TRIP_REQUEST2',
+		efa_url     => 'https://app.vrr.de/vrrstd/XML_TRIP_REQUEST2',
 		origin      => ['Essen', 'HBf'],
 		destination => ['Koeln', 'HBf'],
-		rm_base     => 'http://efa.vrr.de/vrr/',
-		sm_base     => 'http://efa.vrr.de/download/envmaps/',
+		rm_base     => 'https://app.vrr.de/vrrstd/',
+		sm_base     => 'https://app.vrr.de/download/envmaps/',
 		lwp_options => {},
 		submit      => 0,
 	};
-- 
cgit v1.2.3