+ <%=
render "_itinerary_transfer_stop.html",
Map.merge(assigns, %{mode: "personal",
alerts: @itinerary_row.alerts,
bubble_params: transfer_bubbles}) %>
+ <%= render "_walk_list_expand_link.html", Map.merge(
+ assigns,
+ %{
+ target_id: collapse_target_id,
+ expanded: @expanded,
+ bubble_params: transfer_bubbles
+ }
+ ) %>
-<%= render_steps(@conn, steps, "personal", @itinerary_idx, @row_idx) %>
+ <%=
+ content_tag :div, [id: collapse_target_id, class: "collapse stop-list"] do
+ render_steps(@conn, steps, @mode_class, @itinerary_idx, @row_idx)
+ end
+ %>
+
diff --git a/lib/dotcom_web/templates/trip_plan/_itinerary_row_step.html.eex b/lib/dotcom_web/templates/trip_plan/_itinerary_row_step.html.eex
index 226eb82d0a..d2320e39b5 100644
--- a/lib/dotcom_web/templates/trip_plan/_itinerary_row_step.html.eex
+++ b/lib/dotcom_web/templates/trip_plan/_itinerary_row_step.html.eex
@@ -1,13 +1,13 @@
<%= DotcomWeb.PartialView.StopBubbles.render_stop_bubbles(@bubble_params) %>
-
-
<%= @step %>
- <%= render "_itinerary_alert.html",
- itinerary_idx: @itinerary_idx,
- row_idx: @row_idx,
- stop_id: @stop_id,
- alerts: @alerts,
- conn: @conn
+
+ <%= @step %>
+ <%= render "_itinerary_alert.html",
+ itinerary_idx: @itinerary_idx,
+ row_idx: @row_idx,
+ stop_id: @stop_id,
+ alerts: @alerts,
+ conn: @conn
%>
diff --git a/lib/dotcom_web/templates/trip_plan/_itinerary_stop.html.eex b/lib/dotcom_web/templates/trip_plan/_itinerary_stop.html.eex
index caddadab71..a6e47f875f 100644
--- a/lib/dotcom_web/templates/trip_plan/_itinerary_stop.html.eex
+++ b/lib/dotcom_web/templates/trip_plan/_itinerary_stop.html.eex
@@ -1,9 +1,9 @@
<%= if @stop_id do %>
- <%= link @stop_name, to: stop_path(@conn, :show, @stop_id), class: "itinerary-transfer-row-label notranslate" %>
+ <%= link @stop_name, to: stop_path(@conn, :show, @stop_id), class: "notranslate" %>
<%= render "_itinerary_alert.html", assigns %>
<% else %>
- <%= @stop_name %>
+ <%= @stop_name %>
<% end %>
<%= render_stop_departure_display(@departure_display) %>
diff --git a/lib/dotcom_web/templates/trip_plan/_itinerary_transfer_stop.html.eex b/lib/dotcom_web/templates/trip_plan/_itinerary_transfer_stop.html.eex
index 807053300f..a7ca201eed 100644
--- a/lib/dotcom_web/templates/trip_plan/_itinerary_transfer_stop.html.eex
+++ b/lib/dotcom_web/templates/trip_plan/_itinerary_transfer_stop.html.eex
@@ -4,16 +4,7 @@
<%= render "_itinerary_stop.html", assigns %>
<%= if @itinerary_row.route do %>
- <% route = @itinerary_row.route %>
-
- <%# we put the icon and mode name on one line to avoid the whitespace being collapsed. %>
- <%= svg_icon(%SvgIcon{icon: Route.type_atom(route), class: "icon-boring"}) %> Connect to the <%= transfer_route_name(route) %>
-
<%= if @itinerary_row.trip do %>
-
- Take the <%= route.name %> <%= Routes.Route.direction_name(route, @itinerary_row.trip.direction_id) %>
- <%= unless @itinerary_row.trip.headsign == "" do %>towards <%= @itinerary_row.trip.headsign %><% end %>
-
<%= format_schedule_time(@itinerary_row.departure) %>
<% end %>
diff --git a/lib/dotcom_web/templates/trip_plan/_walk_list_expand_link.html.eex b/lib/dotcom_web/templates/trip_plan/_walk_list_expand_link.html.eex
new file mode 100644
index 0000000000..4f4bc8bb62
--- /dev/null
+++ b/lib/dotcom_web/templates/trip_plan/_walk_list_expand_link.html.eex
@@ -0,0 +1,49 @@
+
+
">
+ <%=
+ assigns
+ |> walk_row_params()
+ |> DotcomWeb.PartialView.StopBubbles.render_stop_bubbles(false, nil)
+ %>
+
+
+
+
+ <%= link to: update_url(assigns.conn, expanded: (if @expanded, do: nil, else: @next_stop_name)),
+ class: "toggle-detail-list btn btn-link ps-0 pb-8",
+ data: [toggle: "collapse", target: "##{@target_id}"] do %>
+
+
+
+
+ <%= svg "walk.svg" %>
+
+ <% duration_minutes = display_seconds_as_minutes(@itinerary_row.duration) %>
+ <% distance_miles = display_meters_as_miles(@itinerary_row.distance) %>
+
+ Walk to <%= @next_stop_name %>(<%= distance_miles %> mi, <%= duration_minutes %> min)
+
+
+
+
+ <%= if @expanded, do: "Hide Details", else: "Show Details" %>
+
+ <%= if Map.get(assigns, :alerts?, false) do %>
+
+ <%= fa "exclamation-triangle" %>
+
+ <% end %>
+
+
+
+
+
+
+
+ <%= if @expanded, do: fa("angle-up"), else: fa("angle-down") %>
+
+
+
+ <% end %>
+
+
diff --git a/lib/dotcom_web/views/trip_plan_view.ex b/lib/dotcom_web/views/trip_plan_view.ex
index bb19578e91..bed2df3bb2 100644
--- a/lib/dotcom_web/views/trip_plan_view.ex
+++ b/lib/dotcom_web/views/trip_plan_view.ex
@@ -10,6 +10,7 @@ defmodule DotcomWeb.TripPlanView do
alias DotcomWeb.PartialView.SvgIconWithCircle
alias DotcomWeb.Plugs.Cookies
alias TripPlan.{Itinerary, Leg, Transfer}
+ alias Dotcom.StopBubble
import Schedules.Repo, only: [end_of_rating: 0]
@@ -277,6 +278,25 @@ defmodule DotcomWeb.TripPlanView do
]
end
+ @spec walk_row_params(map()) :: [StopBubble.Params.t()]
+ def walk_row_params(assigns) do
+ [
+ %StopBubble.Params{
+ render_type: :empty,
+ class: "",
+ direction_id: assigns[:direction_id],
+ merge_indent: nil,
+ route_id: nil,
+ route_type: nil,
+ show_line?: true,
+ vehicle_tooltip: nil,
+ content: "",
+ bubble_branch: nil,
+ show_checkmark?: false
+ }
+ ]
+ end
+
def render_steps(conn, steps, mode_class, itinerary_id, row_id) do
for {step, bubbles} <- steps do
render(
@@ -298,6 +318,12 @@ defmodule DotcomWeb.TripPlanView do
:erlang.float_to_binary(meters / @meters_per_mile, decimals: 1)
end
+ @spec display_seconds_as_minutes(integer) :: String.t()
+ def display_seconds_as_minutes(seconds) do
+ minutes = Timex.Duration.to_minutes(seconds, :seconds)
+ :erlang.integer_to_binary(Kernel.max(1, Kernel.round(minutes)))
+ end
+
def format_additional_route(%Route{id: "Green" <> _branch} = route, direction_id) do
[
format_green_line_name(route.name),
diff --git a/lib/mix/tasks/header_footer.ex b/lib/mix/tasks/header_footer.ex
index 0e197e3eb4..fc0b0a0eed 100644
--- a/lib/mix/tasks/header_footer.ex
+++ b/lib/mix/tasks/header_footer.ex
@@ -242,8 +242,6 @@ if Mix.env() in [:dev, :test] do
updated_attrs =
Enum.map(attrs, fn
{"class", class_names} ->
- # IO.inspect(class_names, label: "\tediting classes on <#{tag}>")
-
updated_class_names =
String.split(class_names)
|> Enum.map(&"#{@css_prefix}#{&1}")
diff --git a/lib/trip_plan/api/open_trip_planner.ex b/lib/trip_plan/api/open_trip_planner.ex
index 8559afd79e..13bc9d76fe 100644
--- a/lib/trip_plan/api/open_trip_planner.ex
+++ b/lib/trip_plan/api/open_trip_planner.ex
@@ -63,7 +63,9 @@ defmodule TripPlan.Api.OpenTripPlanner do
long_name: json["route"]["longName"],
type: json["agency"]["name"],
url: json["agency"]["url"],
- description: json["mode"]
+ description: json["mode"],
+ distance: json["distance"],
+ duration: json["duration"]
}
end
diff --git a/lib/trip_plan/leg.ex b/lib/trip_plan/leg.ex
index 6a12b29f18..297ae1bdfe 100644
--- a/lib/trip_plan/leg.ex
+++ b/lib/trip_plan/leg.ex
@@ -18,7 +18,9 @@ defmodule TripPlan.Leg do
type: nil,
description: nil,
url: nil,
- polyline: ""
+ polyline: "",
+ distance: 0.0,
+ duration: 0
@type mode :: PersonalDetail.t() | TransitDetail.t()
@type t :: %__MODULE__{
@@ -32,7 +34,9 @@ defmodule TripPlan.Leg do
type: String.t(),
description: String.t(),
url: String.t(),
- polyline: String.t()
+ polyline: String.t(),
+ distance: Float.t(),
+ duration: Integer.t()
}
@doc "Returns the route ID for the leg, if present"
diff --git a/test/dotcom_web/views/schedule/stop_list_view_test.exs b/test/dotcom_web/views/schedule/stop_list_view_test.exs
index b85173d3b9..1e28d6d979 100644
--- a/test/dotcom_web/views/schedule/stop_list_view_test.exs
+++ b/test/dotcom_web/views/schedule/stop_list_view_test.exs
@@ -231,7 +231,8 @@ defmodule DotcomWeb.StopListViewTest do
route: %Route{id: "Green-E"},
vehicle_tooltip: nil,
expanded: nil,
- conn: %{query_params: %{}, request_path: ""}
+ conn: %{query_params: %{}, request_path: ""},
+ itinerary_row: %{duration: 120, trip: %{headsign: nil, direction_id: 0}}
}
rendered = "_stop_list_expand_link.html" |> ScheduleView.render(assigns) |> safe_to_string()
@@ -239,6 +240,25 @@ defmodule DotcomWeb.StopListViewTest do
assert rendered =~ "11"
end
+ test "Expand link lists duration" do
+ assigns = %{
+ bubbles: [{"Green-E", :line}],
+ target_id: "target-id",
+ intermediate_stop_count: 11,
+ branch_name: "Green-E",
+ branch_display: "Green-E branch",
+ route: %Route{id: "Green-E"},
+ vehicle_tooltip: nil,
+ expanded: nil,
+ conn: %{query_params: %{}, request_path: ""},
+ itinerary_row: %{duration: 120, trip: %{headsign: nil, direction_id: 0}}
+ }
+
+ rendered = "_stop_list_expand_link.html" |> ScheduleView.render(assigns) |> safe_to_string()
+
+ assert rendered =~ "2 min"
+ end
+
test "Expand link displays branch_display as link text" do
assigns = %{
bubbles: [{"Braintree", :line}],
@@ -249,7 +269,8 @@ defmodule DotcomWeb.StopListViewTest do
route: %Route{id: "Red"},
vehicle_tooltip: nil,
expanded: nil,
- conn: %{query_params: %{}, request_path: ""}
+ conn: %{query_params: %{}, request_path: ""},
+ itinerary_row: %{duration: 120, trip: %{headsign: nil, direction_id: 0}}
}
rendered = "_stop_list_expand_link.html" |> ScheduleView.render(assigns) |> safe_to_string()
@@ -267,7 +288,8 @@ defmodule DotcomWeb.StopListViewTest do
route: %Route{id: "Red"},
vehicle_tooltip: nil,
expanded: true,
- conn: %{query_params: %{}, request_path: ""}
+ conn: %{query_params: %{}, request_path: ""},
+ itinerary_row: %{duration: 120, trip: %{headsign: nil, direction_id: 0}}
}
rendered = "_stop_list_expand_link.html" |> ScheduleView.render(assigns) |> safe_to_string()
diff --git a/test/dotcom_web/views/trip_plan_view_test.exs b/test/dotcom_web/views/trip_plan_view_test.exs
index dd6a6654a1..65d15ff711 100644
--- a/test/dotcom_web/views/trip_plan_view_test.exs
+++ b/test/dotcom_web/views/trip_plan_view_test.exs
@@ -450,6 +450,14 @@ closest arrival to 12:00 AM, Thursday, January 1st."
end
end
+ describe "display_seconds_as_minutes/1" do
+ test "converts seconds to minutes" do
+ assert display_seconds_as_minutes(5) == "1"
+ assert display_seconds_as_minutes(59) == "1"
+ assert display_seconds_as_minutes(100) == "2"
+ end
+ end
+
describe "format_additional_route/2" do
@tag :external
test "Correctly formats Green Line route" do