1 files changed, 32 insertions, 40 deletions
diff --git a/templates/wagenreihung.html.ep b/templates/wagenreihung.html.ep
index 493d9c6..19c49ab 100644
--- a/templates/wagenreihung.html.ep
+++ b/templates/wagenreihung.html.ep
@@ -1,64 +1,56 @@
-% if (not $wr or $wr->errstr) {
+% if (not $wr or $wr_error) {
   <div class="container">
     <div class="error">
       <strong>Fehler bei der Abfrage der Wagenreihung:</strong>
-      <%= $wr ? $wr->errstr : $wr_error %>
+      <%= $wr_error // 'Unbekannter Fehler' %>
     </div>
   </div>
 % }
 % else {
-  % my $has_multi_dest = 0;
-  % my $has_multi_desc = 0;
-  % if (scalar $wr->destinations > 1) {
-    % $has_multi_dest = 1;
-  % }
-  % if (scalar $wr->train_descriptions > 1) {
-    % $has_multi_desc = 1;
-  % }
   <div class="container">
     <div style="text-align: center;">
-%=    join( ' / ', $wr->origins )
-      →
-%=    join( ' / ', map { $_->{name} } $wr->destinations )
+      Gleis <%= $wr->platform %><br/>
     </div>
-    % if ($has_multi_dest) {
-      <div style="text-align: center;">
-        % for my $destination ($wr->destinations) {
-          Nach <%= $destination->{name} %> in Abschnitt <%= join(q{}, sort @{$destination->{sections} // []}) %><br/>
-       % }
-      </div>
-    % }
-    <%= $wr->station_name %> Gleis <%= $wr->platform %><br/>
-    % for my $desc ($wr->train_descriptions) {
-      % if ($desc->{text}) {
-        %= $desc->{text}
-        % if ($has_multi_desc and length(join(q{}, sort @{$desc->{sections}}))) {
-          in Abschnitt <%= join(q{}, sort @{$desc->{sections}}) %>
-        % }
-        <br/>
-      % }
-    % }
   </div>
   <div class="container">
     <div class="wagonorder exit-<%= stash('exit_dir') // 'unknown'%>">
-%     if (not $wr->has_bad_wagons) {
-%       for my $section ($wr->sections) {
-          <div class="section" style="
-          top: <%= $section->{start_percent} %>%; bottom: <%= 100 - $section->{end_percent} %>%;">
-%=          $section->{name}
-          </div>
-%       }
+%     for my $sector ($wr->sectors) {
+        <div class="section" style="
+        top: <%= $sector->start_percent %>%; bottom: <%= 100 - $sector->end_percent %>%;">
+%=        $sector->name
+        </div>
 %     }
-%     for my $wagon ($wr->wagons) {
-%=      include '_wagon', direction => $wr->direction, wagon => $wagon, type => $wr->train_type, wref => $wref, exit_dir => stash('exit_dir');
+%     for my $group ($wr->groups) {
+%       my $first = 1;
+%       for my $wagon ($group->carriages) {
+%=        include '_wagon', wr => $wr, group => $group, wagon => $wagon, first => $first, multi => (scalar $wr->destinations) - 1 + (scalar $wr->train_numbers) - 1, wref => $wref, exit_dir => stash('exit_dir'), train_no => param('number');
+%         $first = 0;
+%       }
 %     }
       </div>
+    % for my $group ($wr->groups) {
+      % if ($group->description) {
+        <div style="text-align: center;">
+          %= $group->description
+          % if ($group->designation) {
+            „<%= $group->designation %>“
+          % }
+          % if (scalar $wr->groups > 1 and $group->has_sectors) {
+            in Abschnitt <%= join(q{}, sort $group->sectors) %>
+          % }
+        </div>
+      % }
+    % }
+      <div style="text-align: center;">
+        nach
+%=      join( ' / ', map { $_->{name} } $wr->destinations )
+      </div>
 <!--  <div>
       Legende: ♿ Behindertengerechte Ausstattung / 🍴 Bistro/Restaurant / 🚪 Abteile vorhanden
     </div>
 -->
     <p class="copyright">
-      Quelle: DB Wagenreihungs-API. Angaben ohne Gewähr.
+      Quelle: DB Wagenreihungs-API (<%= stash('ts') // q{} %>). Angaben ohne Gewähr.
     </p>
 
   </div>