Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix several audio issues #767

Merged
merged 1 commit into from
Jun 13, 2024
Merged

fix several audio issues #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions lib/content/audio/service_ended.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@ defmodule Content.Audio.ServiceEnded do
{tts_text(audio), nil}
end

defp tts_text(%Content.Audio.ServiceEnded{location: :station}) do
"This station is closed. Service has ended for the night."
defp tts_text(%Content.Audio.ServiceEnded{location: :station, routes: routes}) do
line = Utilities.get_line_from_routes_list(routes) |> String.capitalize()
"#{line} service has ended for the night."
end

defp tts_text(%Content.Audio.ServiceEnded{location: :platform, destination: destination}) do
Expand Down
16 changes: 8 additions & 8 deletions lib/content/audio/vehicles_to_destination.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ defmodule Content.Audio.VehiclesToDestination do
def to_params(
%Content.Audio.VehiclesToDestination{
headway_range: {range_low, range_high},
destination: destination
routes: routes
} = audio
) do
low_var = Utilities.number_var(range_low, :english)
high_var = Utilities.number_var(range_high, :english)

if low_var && high_var && destination do
if low_var && high_var && !routes do
{:canned, {message_id(audio), [low_var, high_var], :audio}}
else
{:ad_hoc, {tts_text(audio), :audio}}
Expand All @@ -70,15 +70,15 @@ defmodule Content.Audio.VehiclesToDestination do
}) do
trains =
case {destination, routes} do
{destination, nil} ->
{:ok, destination_text} = PaEss.Utilities.destination_to_ad_hoc_string(destination)
"#{destination_text} trains"

{nil, [route]} ->
{_, [route]} ->
"#{route} line trains"

{nil, _} ->
{_, routes} when is_list(routes) ->
"Trains"

{destination, _} ->
{:ok, destination_text} = PaEss.Utilities.destination_to_ad_hoc_string(destination)
"#{destination_text} trains"
end

"#{trains} every #{range_low} to #{range_high} minutes."
Expand Down
11 changes: 8 additions & 3 deletions test/signs/realtime_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1369,9 +1369,14 @@ defmodule Signs.RealtimeTest do

expect_messages({"Red line trains", "Every 9 to 13 min"})

expect_audios([{:ad_hoc, {"Red line trains every 9 to 13 minutes.", :audio}}], [
{"Red line trains every 9 to 13 minutes.", nil}
])

Signs.Realtime.handle_info(:run_loop, %{
@mezzanine_sign
| current_time_fn: fn -> datetime(~T[04:50:00]) end
| current_time_fn: fn -> datetime(~T[04:50:00]) end,
tick_read: 0
})
end

Expand Down Expand Up @@ -1638,7 +1643,7 @@ defmodule Signs.RealtimeTest do
expect_messages({"Station closed", "Service ended for night"})

expect_audios([{:canned, {"105", ["864", "21000", "882"], :audio}}], [
{"This station is closed. Service has ended for the night.", nil}
{"Train service has ended for the night.", nil}
])

Signs.Realtime.handle_info(:run_loop, %{@multi_route_mezzanine_sign | tick_read: 0})
Expand All @@ -1653,7 +1658,7 @@ defmodule Signs.RealtimeTest do
expect_messages({"No Red Line", "Service ended for night"})

expect_audios([{:canned, {"105", ["3005", "21000", "882"], :audio}}], [
{"This station is closed. Service has ended for the night.", nil}
{"Red line service has ended for the night.", nil}
])

Signs.Realtime.handle_info(:run_loop, sign)
Expand Down
Loading