From 962bb7e20b249f9d272518a517e5cf04a0a50727 Mon Sep 17 00:00:00 2001
From: Daniel Friesel <derf@finalrewind.org>
Date: Sun, 2 Oct 2022 22:21:37 +0200
Subject: ÖBB: switch to mgate
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/Travel/Status/DE/HAFAS.pm | 18 ++++++++++++++++--
 scripts/check-hafas-urls      |  2 +-
 2 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/lib/Travel/Status/DE/HAFAS.pm b/lib/Travel/Status/DE/HAFAS.pm
index 0d6175d..cbb4dbb 100644
--- a/lib/Travel/Status/DE/HAFAS.pm
+++ b/lib/Travel/Status/DE/HAFAS.pm
@@ -117,11 +117,25 @@ my %hafas_instance = (
 		},
 	},
 	'ÖBB' => {
-		url         => 'https://fahrplan.oebb.at/bin/stboard.exe',
+		mgate       => 'https://fahrplan.oebb.at/bin/mgate.exe',
 		stopfinder  => 'https://fahrplan.oebb.at/bin/ajax-getstop.exe',
 		name        => 'Österreichische Bundesbahnen',
 		productbits =>
 		  [qw[ice ice ice regio regio s bus ferry u tram ice ondemand ice]],
+		request => {
+			client => {
+				id   => 'OEBB',
+				v    => '6030600',
+				type => 'IPH',
+				name => 'oebbPROD-ADHOC',
+			},
+			ver  => '1.41',
+			auth => {
+				type => 'AID',
+				aid  => 'OWDL4fE4' . 'ixNiPBBm',
+			},
+			lang => 'deu',
+		},
 	},
 	RSAG => {
 		url         => 'https://fahrplan.rsag-online.de/hafas/stboard.exe',
@@ -211,7 +225,7 @@ sub new_mgate {
 		$lid = 'A=1@O=' . $self->{station} . '@';
 	}
 
-	my $mot_mask = 1023;
+	my $mot_mask = 2**@{ $hafas_instance{$service}{productbits} } - 1;
 
 	my %mot_pos;
 	for my $i ( 0 .. $#{ $hafas_instance{$service}{productbits} } ) {
diff --git a/scripts/check-hafas-urls b/scripts/check-hafas-urls
index 257db95..b5ee8e8 100755
--- a/scripts/check-hafas-urls
+++ b/scripts/check-hafas-urls
@@ -6,7 +6,7 @@ checks="DB Berlin Jannowitzbrücke
 NAHSH Flensburg
 NASA Wernigerode Hbf
 NVV Kassel Hauptbahnhof
-ÖBB Wien Praterstern
+ÖBB Wien Meidling
 RSAG Rostock Hbf
 VBB Berlin Jannowitzbrücke
 VBN Diepholz"
-- 
cgit v1.2.3