summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBirte Kristina Friesel <derf@finalrewind.org>2025-12-17 18:32:55 +0100
committerBirte Kristina Friesel <derf@finalrewind.org>2025-12-17 18:32:55 +0100
commit96dfab6a7fec08e2c83bbc0bd22b330985692784 (patch)
tree82c034025982f62ea9eabdee8df2c9413664720d
parent7ce6e9e90a38aba0f2e0a3e9d8d55406a7c3e391 (diff)
View: Normalize trip type / line number to avoid redundancyHEAD2.17.35main
Closes #343
-rw-r--r--templates/_departures_dbris.html.ep2
-rw-r--r--templates/_format_train.html.ep5
-rw-r--r--templates/_history_trains.html.ep5
3 files changed, 9 insertions, 3 deletions
diff --git a/templates/_departures_dbris.html.ep b/templates/_departures_dbris.html.ep
index dbd1a70..f769f13 100644
--- a/templates/_departures_dbris.html.ep
+++ b/templates/_departures_dbris.html.ep
@@ -33,7 +33,7 @@
<i class="material-icons" aria-label="Keine Echtzeitdaten vorhanden" style="font-size: 16px;">gps_off</i>
% }
</a>
- <span class="dep-line <%= $result->type // q{} %>">
+ <span class="dep-line <%= ($result->type // q{}) =~ tr{a-zA-Z_-}{}cdr %> <%= $result->line =~ s{ ^ \D+ \K \d .* $ }{}rx %>">
%= $result->line
</span>
<span class="dep-dest">
diff --git a/templates/_format_train.html.ep b/templates/_format_train.html.ep
index cb81211..f06e905 100644
--- a/templates/_format_train.html.ep
+++ b/templates/_format_train.html.ep
@@ -1,10 +1,13 @@
% if ($journey->{extra_data}{wagonorder_pride}) {
🏳️‍🌈
% }
-<span class="dep-line <%= ($journey->{train_type} // q{}) =~ tr{a-zA-Z_-}{}cdr %>">
+<span class="dep-line <%= ($journey->{train_type} // q{}) =~ tr{a-zA-Z_-}{}cdr %> <%= ($journey->{train_line} // q{}) =~ s{ ^ \D+ \K \d .* $ }{}rx %>">
% if (not $journey->{is_motis}) {
<%= $journey->{train_type} %>
% }
+ % if ($journey->{train_type} and $journey->{train_line}) {
+ % $journey->{train_line} =~ s{ ^ \Q$journey->{train_type}\E (?= \d ) }{}x;
+ % }
<%= $journey->{train_line} // $journey->{train_no}%>
</span>
% if ($journey->{train_line}) {
diff --git a/templates/_history_trains.html.ep b/templates/_history_trains.html.ep
index 166d74d..0a9abd5 100644
--- a/templates/_history_trains.html.ep
+++ b/templates/_history_trains.html.ep
@@ -16,10 +16,13 @@
% }
<li class="collection-item">
<a href="<%= $detail_link %>">
- <span class="dep-line <%= ($travel->{type} // q{}) =~ tr{a-zA-Z_-}{}cdr %>">
+ <span class="dep-line <%= ($travel->{type} // q{}) =~ tr{a-zA-Z_-}{}cdr %> <%= ($travel->{line} // q{}) =~ s{ ^ \D+ \K \d .* $ }{}rx %>">
% if (length($travel->{type}) < 5 and not $travel->{is_motis}) {
<%= $travel->{type} %>
% }
+ % if ($travel->{type} and $travel->{line}) {
+ % $travel->{line} =~ s{ ^ \Q$travel->{type}\E (?= \d ) }{}x;
+ % }
<%= $travel->{line} // $travel->{no}%>
</span>
</a>