1 files changed, 32 insertions, 31 deletions

diff --git a/templates/_train_details.html.ep b/templates/_train_details.html.ep
index 709a1ac..fd18623 100644
--- a/templates/_train_details.html.ep
+++ b/templates/_train_details.html.ep
@@ -68,10 +68,10 @@
 %   else {
 %     my $left = '';
 %     my $right = '';
-%     if ($departure->{direction} and $departure->{direction} eq 'l') {
+%     if ($departure->{wr_direction} and $departure->{wr_direction} =~ m{l}) {
 %       $left = '◀ ';
 %     }
-%     elsif ($departure->{direction} and $departure->{direction} eq 'r') {
+%     elsif ($departure->{wr_direction} and $departure->{wr_direction} =~ m{r}) {
 %       $right = ' ▶';
 %     }
 %     if ($departure->{scheduled_platform} and $departure->{platform}
@@ -118,32 +118,27 @@
     </div> <!-- dataline -->
 %   if (my $wr = $departure->{wr}) {
       <div class="wagonorder-preview">
-%     my @wagons = $wr->wagons;
-%     my $direction = $wr->direction ? $wr->direction == 100 ? '→' : '←' : q{};
-%     if ($departure->{direction}) {
-%       $direction = $departure->{direction} eq 'l' ? '◀' : '▶';
-%       if (($departure->{direction} eq 'l' ? 0 : 100) != $wr->direction) {
-%         @wagons = reverse @wagons;
-%       }
+%     my $left = defined $wr->direction ? $wr->direction == 100 ? q{} : '←' : q{};
+%     my $right = defined $wr->direction ? $wr->direction == 100 ? '→' : q{} : q{};
+%     if ($departure->{wr_direction} and $departure->{wr_direction} =~ m{l}) {
+%       $left = '◀';
+%       $right = q{};
 %     }
-      <a href="/_wr/<%= $departure->{train_no} %>/<%= $departure->{wr_link} %>?e=<%= $departure->{direction} // '' %>">
-      %= $direction
-%     my $gi;
-%     for my $wagon (@wagons) {
-%       if (not ($wagon->is_locomotive or $wagon->is_powercar)) {
-%         if (defined $gi and $gi != $wagon->group_index) {
-            •
-%         }
-%         if ($wagon->is_closed) {
-            X
-%         }
-%         else {
-%=          $wagon->number || ($wagon->type =~ m{AB} ? '½' : $wagon->type =~ m{A} ? '1.' : $wagon->type =~ m{B} ? '2.' : $wagon->type )
-%         }
-%       }
-%       $gi = $wagon->group_index;
+%     elsif ($departure->{wr_direction} and $departure->{wr_direction} =~ m{r}) {
+%       $left = q{};
+%       $right = '▶';
 %     }
-      %= $direction
+      <a href="/carriage-formation?<%= $departure->{wr_link} %>&amp;e=<%= $departure->{wr_direction} // '' %>">
+      %= $left
+      % for my $entry ((defined $departure->{wr_direction_num} and $departure->{wr_direction_num} != $wr->direction) ? reverse @{$departure->{wr_preview} // []} : @{$departure->{wr_preview} // []}) {
+        % if ($entry->[1]) {
+          <span class="<%= $entry->[1] %>"><%= $entry->[0] %></span>
+        % }
+        % else {
+          %= $entry->[0]
+        % }
+      % }
+      %= $right
       </a>
       </div>
 %   }
@@ -157,10 +152,10 @@
 %       }
 %     }
 %     if ($departure->{wr_link}) {
-        <a class="smallbutton" href="/_wr/<%= $departure->{train_no} %>/<%= $departure->{wr_link} %>?e=<%= $departure->{direction} // '' %>"><i class="material-icons" aria-hidden="true">train</i> <%= $departure->{wr_text} || 'Wagen' %>
+        <a class="smallbutton" href="/carriage-formation?<%= $departure->{wr_link} %>&amp;e=<%= $departure->{wr_direction} // '' %>"><i class="material-icons" aria-hidden="true">train</i> <%= $departure->{wr_text} || 'Wagen' %>
         </a>
 %     }
-%     if ($departure->{train_type} and $departure->{train_no}) {
+%     if ($departure->{train_type} and $departure->{train_no} and (not param('hafas') or param('hafas') eq 'DB')) {
         <a class="smallbutton" href="https://bahn.expert/details/<%= $departure->{train_type} %>%20<%= $departure->{train_no} %>/<%= ($departure->{date} // DateTime->now(time_zone => 'Europe/Berlin'))->iso8601 %>?evaNumberAlongRoute=<%= $departure->{eva} %>"><img src="/static/icons/bahn-expert.svg">Details</a>
 %     }
 %     for my $link (@{$departure->{links}}) {
@@ -285,7 +280,9 @@
           <%= $stop->{name} %></a>
 %         if ($stop->{load}{FIRST} or $stop->{load}{SECOND}) {
 %           my ($text, $icon1, $icon2) = utilization_icon([$stop->{load}{FIRST}, $stop->{load}{SECOND}]);
-            <i class="material-icons" aria-hidden="true"><%= $icon1 %></i>
+            % if ($icon1 ne 'help_outline') {
+              <i class="material-icons" aria-hidden="true"><%= $icon1 %></i>
+            % }
             <i class="material-icons" aria-hidden="true"><%= $icon2 %></i>
 %         }
           </li>
@@ -328,7 +325,9 @@
             <strong><%= stash('station_name') %></strong>
 %           if (my $u = $departure->{utilization}) {
 %             my ($text, $icon1, $icon2) = utilization_icon($u);
-              <i class="material-icons" aria-hidden="true"><%= $icon1 %></i>
+            % if ($icon1 ne 'help_outline') {
+                <i class="material-icons" aria-hidden="true"><%= $icon1 %></i>
+            % }
               <i class="material-icons" aria-hidden="true"><%= $icon2 %></i>
 %           }
           </li>
@@ -376,7 +375,9 @@
           <%= $stop->{name} %></a>
 %         if ($stop->{load}{FIRST} or $stop->{load}{SECOND}) {
 %           my ($text, $icon1, $icon2) = utilization_icon([$stop->{load}{FIRST}, $stop->{load}{SECOND}]);
-            <i class="material-icons" aria-hidden="true"><%= $icon1 %></i>
+            % if ($icon1 ne 'help_outline') {
+              <i class="material-icons" aria-hidden="true"><%= $icon1 %></i>
+            % }
             <i class="material-icons" aria-hidden="true"><%= $icon2 %></i>
 %         }
           </li>