Unverified Commit 1557c716 authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Update ÖBB productbits and add descriptions to list

parent 791439d5

bin/hafas

+8 −4
Original line number Original line Diff line number Diff line
@@ -156,10 +156,14 @@ sub parse_mot_options { 
			my $desc = Travel::Routing::DE::HAFAS::get_service($service);

			my $desc = Travel::Routing::DE::HAFAS::get_service($service);

			if ($desc) {

			if ($desc) {

				my @mots = @{ $desc->{productbits} };

				my @mots = @{ $desc->{productbits} };

				@mots = grep { $_ ne 'x' } @mots;

				for my $mot ( @{ $desc->{productbits} } ) {

				@mots = uniq @mots;

					if ( ref($mot) eq 'ARRAY' ) {

				@mots = sort @mots;

						printf( "%-10s %s\n", @{$mot} );

				say join( "\n", @mots );

					}

					else {

						say $mot;

					}

				}

				exit 0;

				exit 0;

			}

			}

			else {

			else {

lib/Travel/Routing/DE/HAFAS.pm

+19 −3
Original line number Original line Diff line number Diff line
@@ -108,8 +108,19 @@ my %hafas_instance = ( 
	'ÖBB' => {

	'ÖBB' => {

		mgate       => 'https://fahrplan.oebb.at/bin/mgate.exe',

		mgate       => 'https://fahrplan.oebb.at/bin/mgate.exe',

		name        => 'Österreichische Bundesbahnen',

		name        => 'Österreichische Bundesbahnen',

		productbits =>

		productbits => [

		  [qw[ice ice ice regio regio s bus ferry u tram ice ondemand ice]],

			[ ice_rj => 'long distance trains' ],

			[ sev    => 'rail replacement service' ],

			[ ic_ec  => 'long distance trains' ],

			[ d_n    => 'night trains and rapid trains' ],

			[ regio  => 'regional trains' ],

			[ s      => 'suburban trains' ],

			[ bus    => 'busses' ],

			[ ferry  => 'maritime transit' ],

			[ u      => 'underground' ],

			[ tram   => 'trams' ],

			[ other  => 'other transit services' ]

		],

		request => {

		request => {

			client => {

			client => {

				id   => 'OEBB',

				id   => 'OEBB',
@@ -379,8 +390,13 @@ sub mot_mask { 




	my %mot_pos;

	my %mot_pos;

	for my $i ( 0 .. $#{ $hafas_instance{$service}{productbits} } ) {

	for my $i ( 0 .. $#{ $hafas_instance{$service}{productbits} } ) {

		if ( ref( $hafas_instance{$service}{productbits}[$i] ) eq 'ARRAY' ) {

			$mot_pos{ $hafas_instance{$service}{productbits}[$i][0] } = $i;

		}

		else {

			$mot_pos{ $hafas_instance{$service}{productbits}[$i] } = $i;

			$mot_pos{ $hafas_instance{$service}{productbits}[$i] } = $i;

		}

		}

	}





	if ( my @mots = @{ $self->{exclusive_mots} // [] } ) {

	if ( my @mots = @{ $self->{exclusive_mots} // [] } ) {

		$mot_mask = 0;

		$mot_mask = 0;