Commit fd7afd8f authored by Birte Kristina Friesel's avatar Birte Kristina Friesel
Browse files

wagon image: do not mis-label unknown (e.g. EC) trains as IC 

Fixes wrong wagon images being displayed for swiss (and probably other) EC
trains.
parent b8b70bca

templates/_wagon.html.ep

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
  <div class="details" style="

  top: <%= $wagon->{position}{start_percent} %>%; bottom: <%= 100 - $wagon->{position}{end_percent} %>%;">

%   if ($exit_dir ne 'right') {

%     if (my $img = wagon_image($wagon->train_subtype // 'IC', $wagon->type, $wagon->uic_id)) {

%     if (my $img = wagon_image($wagon->train_subtype // $type // '?', $wagon->type, $wagon->uic_id)) {

        <a class="type" href="/w/<%= $img %>?n=<%= $wagon->number // '' %>&amp;s=<%= $wagon->section %>&amp;r=<%= $wref %>"><%= $wagon->type %></a>

%     }

%     else {
@@ -71,7 +71,7 @@ 
      <span class="uicexchange"><%= substr($uic_id, 0, 2) %></span><span class="uiccountry"><%= substr($uic_id, 2, 2) %></span><span class="uic56"><%= substr($uic_id, 4, 2) %></span><span class="uic78"><%= substr($uic_id, 6, 2) %></span><span class="uicno"><%= substr($uic_id, 8, 3) %></span><span class="uiccheck"><%= substr($uic_id, 11) %></span>

%   }

%   if ($exit_dir eq 'right') {

%     if (my $img = wagon_image($wagon->train_subtype // 'IC', $wagon->type, $wagon->uic_id)) {

%     if (my $img = wagon_image($wagon->train_subtype // $type // '?', $wagon->type, $wagon->uic_id)) {

        <a class="type" href="/w/<%= $img %>?n=<%= $wagon->number // '' %>&amp;s=<%= $wagon->section %>&amp;r=<%= $wref %>"><%= $wagon->type %></a>

%     }

%     else {

templates/wagenreihung.html.ep

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ 
%       }

%     }

%     for my $wagon ($wr->wagons) {

%=      include '_wagon', direction => $wr->direction, wagon => $wagon, wref => $wref, exit_dir => stash('exit_dir');

%=      include '_wagon', direction => $wr->direction, wagon => $wagon, type => $wr->train_type, wref => $wref, exit_dir => stash('exit_dir');

%     }

      </div>

<!--  <div>