summaryrefslogtreecommitdiff
path: root/lib/Travel/Status/DE
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2022-10-03 08:17:38 +0200
committerDaniel Friesel <derf@finalrewind.org>2022-10-03 08:17:38 +0200
commitba516cdbad7c1fe7bd9a3fe662ae5c680c561bc7 (patch)
treef8801a354dfab58daaa06eb3b083e1fba513342c /lib/Travel/Status/DE
parent372843cba3be1a1a6f636b070d32db26c0a1acd8 (diff)
VBB: switch to mgate
Diffstat (limited to 'lib/Travel/Status/DE')
-rw-r--r--lib/Travel/Status/DE/HAFAS.pm35
1 files changed, 33 insertions, 2 deletions
diff --git a/lib/Travel/Status/DE/HAFAS.pm b/lib/Travel/Status/DE/HAFAS.pm
index c563d34..15249d0 100644
--- a/lib/Travel/Status/DE/HAFAS.pm
+++ b/lib/Travel/Status/DE/HAFAS.pm
@@ -144,10 +144,25 @@ my %hafas_instance = (
productbits => [qw[ice ice ice regio s bus ferry u tram ondemand]],
},
VBB => {
- url => 'https://fahrinfo.vbb.de/bin/stboard.exe',
+ mgate => 'https://fahrinfo.vbb.de/bin/mgate.exe',
stopfinder => 'https://fahrinfo.vbb.de/bin/ajax-getstop.exe',
name => 'Verkehrsverbund Berlin-Brandenburg',
productbits => [qw[s u tram bus ferry ice regio]],
+ request => {
+ client => {
+ id => 'VBB',
+ type => 'WEB',
+ name => 'VBB WebApp',
+ l => 'vs_webapp_vbb',
+ },
+ ext => 'VBB.1',
+ ver => '1.33',
+ auth => {
+ type => 'AID',
+ aid => 'hafas-vb' . 'b-webapp',
+ },
+ lang => 'deu',
+ },
},
VBN => {
url => 'https://fahrplaner.vbn.de/hafas/stboard.exe',
@@ -498,13 +513,24 @@ sub similar_stops {
}
sub add_message {
- my ( $self, $json ) = @_;
+ my ( $self, $json, $is_him ) = @_;
my $short = $json->{txtS};
my $text = $json->{txtN};
my $code = $json->{code};
my $prio = $json->{prio};
+ if ($is_him) {
+ $short = $json->{head};
+ $text = $json->{text};
+ $code = $json->{hid};
+ }
+
+ # Some backends use remL for operator information. We don't want that.
+ if ( $code eq 'OPERATOR' ) {
+ return;
+ }
+
for my $message ( @{ $self->{messages} } ) {
if ( $code eq $message->{code} and $text eq $message->{text} ) {
$message->{ref_count}++;
@@ -650,6 +676,7 @@ sub parse_mgate {
my @opL = @{ $self->{raw_json}{svcResL}[0]{res}{common}{opL} // [] };
my @icoL = @{ $self->{raw_json}{svcResL}[0]{res}{common}{icoL} // [] };
my @remL = @{ $self->{raw_json}{svcResL}[0]{res}{common}{remL} // [] };
+ my @himL = @{ $self->{raw_json}{svcResL}[0]{res}{common}{himL} // [] };
my @jnyL = @{ $self->{raw_json}{svcResL}[0]{res}{jnyL} // [] };
for my $result (@jnyL) {
@@ -692,6 +719,10 @@ sub parse_mgate {
if ( $msg->{type} eq 'REM' and defined $msg->{remX} ) {
push( @messages, $self->add_message( $remL[ $msg->{remX} ] ) );
}
+ elsif ( $msg->{type} eq 'HIM' and defined $msg->{himX} ) {
+ push( @messages,
+ $self->add_message( $himL[ $msg->{himX} ], 1 ) );
+ }
else {
say "Unknown message type $msg->{type}";
}