Unverified Commit 4f1cc8be authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

Trip: Fix polyline accessor. It never really worked.

parent 1f2949aa

lib/Travel/Status/DE/EFA/Trip.pm

+17 −6
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ sub new { 
		operator      => $json->{operator}{name},

		operator      => $json->{operator}{name},

		product       => $json->{product}{name},

		product       => $json->{product}{name},

		product_class => $json->{product}{class},

		product_class => $json->{product}{class},

		polyline      => $json->{coords},

		polyline_raw  => $conf{json}{leg}{coords},

		name          => $json->{name},

		name          => $json->{name},

		line          => $json->{disassembledName},

		line          => $json->{disassembledName},

		number        => $json->{properties}{trainNumber},

		number        => $json->{properties}{trainNumber},
@@ -39,8 +39,10 @@ sub new { 
			time_zone => 'UTC'

			time_zone => 'UTC'

		),

		),

	};

	};

	if ( ref( $ref->{polyline} ) eq 'ARRAY' and @{ $ref->{polyline} } == 1 ) {

	if ( ref( $ref->{polyline_raw} ) eq 'ARRAY'

		$ref->{polyline} = $ref->{polyline}[0];

		and @{ $ref->{polyline_raw} } == 1 )

	{

		$ref->{polyline_raw} = $ref->{polyline_raw}[0];

	}

	}

	return bless( $ref, $obj );

	return bless( $ref, $obj );

}

}
@@ -48,13 +50,22 @@ sub new { 
sub polyline {

sub polyline {

	my ( $self, %opt ) = @_;

	my ( $self, %opt ) = @_;





	if ( $opt{fallback} and not @{ $self->{polyline} // [] } ) {

	if ( $self->{polyline} ) {

		return @{ $self->{polyline} };

	}



	if ( $opt{fallback} and not @{ $self->{polyline_raw} // [] } ) {





		# TODO add $_->{id} as well?

		# TODO add $_->{id} as well?

		return map { $_->{latlon} } $self->route;

		return

		  map { { lat => $_->{latlon}[0], lon => $_->{latlon}[1] } }

		  $self->route;

	}

	}





	return @{ $self->{polyline} // [] };

	$self->{polyline} = [ map { { lat => $_->[0], lon => $_->[1] } }

		  @{ $self->{polyline_raw} } ];



	return @{ $self->{polyline} };

}

}





sub parse_dt {

sub parse_dt {