diff options
| author | Daniel Friesel <derf@finalrewind.org> | 2021-02-18 18:34:33 +0100 |
|---|---|---|
| committer | Daniel Friesel <derf@finalrewind.org> | 2021-02-18 18:34:33 +0100 |
| commit | fd7afd8f42c029bdaf9d11118f53500805ddad6b (patch) | |
| tree | dddedc29ed614e480d6e18561be90056852e916c | |
| parent | b8b70bca030ff0db174bfde92418ed98617b0bdb (diff) | |
wagon image: do not mis-label unknown (e.g. EC) trains as IC3.10.8
Fixes wrong wagon images being displayed for swiss (and probably other) EC
trains.
| -rw-r--r-- | templates/_wagon.html.ep | 4 | ||||
| -rw-r--r-- | templates/wagenreihung.html.ep | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/templates/_wagon.html.ep b/templates/_wagon.html.ep index 6c02827..94ef56a 100644 --- a/templates/_wagon.html.ep +++ b/templates/_wagon.html.ep @@ -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 // '' %>&s=<%= $wagon->section %>&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 // '' %>&s=<%= $wagon->section %>&r=<%= $wref %>"><%= $wagon->type %></a> % } % else { diff --git a/templates/wagenreihung.html.ep b/templates/wagenreihung.html.ep index 0686063..9fe132d 100644 --- a/templates/wagenreihung.html.ep +++ b/templates/wagenreihung.html.ep @@ -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> |