summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2017-07-05 22:29:36 +0200
committerDaniel Friesel <derf@finalrewind.org>2017-07-05 22:29:36 +0200
commit38550675fc41f8febad14c70bbbef82808675653 (patch)
treef6513345a9ff129faa94d592fe8d0658af4385c0 /lib
parent2ee532b755bbf2a920c7c3a38b2a822dd0151845 (diff)
Fix encoding issues caused by recent API changes
Diffstat (limited to 'lib')
-rw-r--r--lib/Travel/Routing/DE/EFA.pm37
1 files changed, 14 insertions, 23 deletions
diff --git a/lib/Travel/Routing/DE/EFA.pm b/lib/Travel/Routing/DE/EFA.pm
index 8f9ac29..06175f6 100644
--- a/lib/Travel/Routing/DE/EFA.pm
+++ b/lib/Travel/Routing/DE/EFA.pm
@@ -7,7 +7,7 @@ use 5.010;
no if $] >= 5.018, warnings => "experimental::smartmatch";
use Carp qw(cluck);
-use Encode qw(decode encode);
+use Encode qw(encode);
use Travel::Routing::DE::EFA::Route;
use Travel::Routing::DE::EFA::Route::Message;
use LWP::UserAgent;
@@ -435,7 +435,7 @@ sub create_post {
}
for my $val ( values %{ $self->{post} } ) {
- $val = encode( 'ISO-8859-15', $val );
+ $val = encode( 'UTF-8', $val );
}
return;
@@ -555,7 +555,6 @@ sub parse_cur_info {
raw_content => $e_content->textContent,
);
for my $key ( keys %msg ) {
- $msg{$key} = decode( 'UTF-8', $msg{$key} );
chomp( $msg{$key} );
}
return Travel::Routing::DE::EFA::Route::Message->new(%msg);
@@ -565,7 +564,7 @@ sub parse_reg_info {
my ( $self, $node ) = @_;
my %msg = (
- summary => decode( 'UTF-8', $node->textContent ),
+ summary => $node->textContent,
);
return Travel::Routing::DE::EFA::Route::Message->new(%msg);
@@ -686,10 +685,6 @@ sub parse_xml_part {
arrival_platform => $e_arr->getAttribute('platformName'),
};
- for my $key ( keys %{$hash} ) {
- $hash->{$key} = decode( 'UTF-8', $hash->{$key} );
- }
-
if ($e_fp) {
# Note that position=IDEST footpaths are coupled with a special
@@ -721,7 +716,7 @@ sub parse_xml_part {
next;
}
- my $name = decode( 'UTF-8', $ve->getAttribute('name') );
+ my $name = $ve->getAttribute('name');
my $platform = $ve->getAttribute('platformName');
if ( $name ~~ [ $hash->{departure_stop}, $hash->{arrival_stop} ] ) {
@@ -816,25 +811,21 @@ sub check_ambiguous_xml {
if ( $s_place eq 'list' ) {
Travel::Routing::DE::EFA::Exception::Ambiguous->throw(
- post_key => 'place',
- post_value => decode(
- 'UTF-8',
- ( $e_place->findnodes($xp_place_input) )[0]->textContent
- ),
+ post_key => 'place',
+ post_value =>
+ ( $e_place->findnodes($xp_place_input) )[0]->textContent,
possibilities => join( q{ | },
- map { decode( 'UTF-8', $_->textContent ) }
+ map { $_->textContent }
@{ $e_place->findnodes($xp_place_elem) } )
);
}
if ( $s_name eq 'list' ) {
Travel::Routing::DE::EFA::Exception::Ambiguous->throw(
- post_key => 'name',
- post_value => decode(
- 'UTF-8', ( $e_name->findnodes($xp_name_input) )[0]->textContent
- ),
+ post_key => 'name',
+ post_value =>
+ ( $e_name->findnodes($xp_name_input) )[0]->textContent,
possibilities => join( q{ | },
- map { decode( 'UTF-8', $_->textContent ) }
- @{ $e_name->findnodes($xp_name_elem) } )
+ map { $_->textContent } @{ $e_name->findnodes($xp_name_elem) } )
);
}
@@ -928,8 +919,8 @@ sub get_efa_urls {
shortname => 'VRNdelfi',
},
{
- url => 'http://fahrplanauskunft.vrn.de/vrn/XML_TRIP_REQUEST2',
- name => 'Verkehrsverbund Rhein-Neckar',
+ url => 'http://fahrplanauskunft.vrn.de/vrn/XML_TRIP_REQUEST2',
+ name => 'Verkehrsverbund Rhein-Neckar',
shortname => 'VRN',
},
{