summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Friesel <derf@finalrewind.org>2023-01-09 18:38:50 +0100
committerDaniel Friesel <derf@finalrewind.org>2023-01-09 18:38:50 +0100
commit0cbfcf55948c1ec953a39942b47a1b60a276d572 (patch)
tree30f3bcef34246e854630f4f58e06ccd8bb7fb243
parentd0891186b6e2d5baf7141c2ce0ecdfdc246097b2 (diff)
Re-add train attributes4.14.7
-rw-r--r--lib/DBInfoscreen/Controller/Stationboard.pm19
-rw-r--r--templates/_train_attr.html.ep16
-rw-r--r--templates/_train_details.html.ep8
3 files changed, 11 insertions, 32 deletions
diff --git a/lib/DBInfoscreen/Controller/Stationboard.pm b/lib/DBInfoscreen/Controller/Stationboard.pm
index 145a5e3..59b7748 100644
--- a/lib/DBInfoscreen/Controller/Stationboard.pm
+++ b/lib/DBInfoscreen/Controller/Stationboard.pm
@@ -809,24 +809,7 @@ sub render_train {
}
)->wait;
- # currently useless due to lack of Open Data
- if ( 0 and $self->param('detailed') ) {
- my $cycle_req = Mojo::Promise->new;
- push( @requests, $cycle_req );
- $self->wagonorder->has_cycle_p( $result->train_no )->then(
- sub {
- $departure->{has_cycle} = 1;
- }
- )->catch(
- sub {
- # nop
- }
- )->finally(
- sub {
- $cycle_req->resolve;
- return;
- }
- )->wait;
+ if ( $self->param('detailed') ) {
$departure->{composition}
= $self->app->train_details_db->{ $departure->{train_no} };
my @cycle_from;
diff --git a/templates/_train_attr.html.ep b/templates/_train_attr.html.ep
index 4f7e9ca..dad21e4 100644
--- a/templates/_train_attr.html.ep
+++ b/templates/_train_attr.html.ep
@@ -1,19 +1,15 @@
-% if ($attr->{series}) {
- <span>BR <%= $attr->{series} %>
-% if ($attr->{series2}) {
- + <%= $attr->{series2} %>
-% }
- </span>
+% if ($attr->{vmax}) {
+ <span><%= $attr->{vmax} %> km/h</span>
% }
% if ($attr->{length}) {
<span>⇤ <%= $attr->{length} %>m ⇥</span>
% }
-% if ($attr->{vmax}) {
- <span><%= $attr->{vmax} %> km/h</span>
+% if ($attr->{weight}) {
+ <span><%= $attr->{weight} %>t</span>
% }
% if ($attr->{brakingPercentage}) {
<span>λ=<%= $attr->{brakingPercentage} %></span>
% }
-% if ($attr->{station} and $with_station) {
- <span>ab <%= $attr->{station} %></span>
+% if ($with_station and $attr->{range}[0]) {
+ <span>ab <%= $attr->{range}[0] %></span>
% }
diff --git a/templates/_train_details.html.ep b/templates/_train_details.html.ep
index 167068e..0484388 100644
--- a/templates/_train_details.html.ep
+++ b/templates/_train_details.html.ep
@@ -324,12 +324,12 @@
<div class="db-attr"><a href="https://lib.finalrewind.org/dbdb/db_umlauf/<%= $departure->{train_no} %>.svg">Umlaufplan</a>
(ggf. fehlerhaft)</div>
% }
-% if ($details->{commonAttr}) {
-% if ($details->{attrVariants} and (not $details->{commonAttr}{vmax} or not $details->{commonAttr}{brakingPercentage})) {
+% if ($details->{attributes}) {
+% if (@{$details->{attributes}} > 1) {
<div class="db-attr">
Attribute:
<ul>
-% for my $attr (@{$details->{attrVariants} // [] }) {
+% for my $attr (@{$details->{attributes}}) {
<li><%= include '_train_attr', attr => $attr, with_station => 1 %></li>
% }
</ul>
@@ -337,7 +337,7 @@
% }
% else {
<div class="db-attr">
-%= include '_train_attr', attr => $details->{commonAttr}, with_station => 0
+%= include '_train_attr', attr => $details->{attributes}[0], with_station => 0
</div>
% }
% }