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

Requêteur SIRI : corrige requête EstimatedTimetable #3508

Merged
merged 1 commit into from
Oct 5, 2023
Merged

Requêteur SIRI : corrige requête EstimatedTimetable #3508

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
18 changes: 5 additions & 13 deletions apps/transport/lib/siri_queries.ex
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,22 +78,14 @@ defmodule Transport.SIRI do
Saxy.encode!(doc)
end

def build_line_refs(line_refs) do
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

N'était plus utilisé

# NOTE: we'll switch to proper well-escaped XML building later, this is research code
line_refs = line_refs |> Enum.map_join("\n", &"<siri:LineRef>#{&1}</siri:LineRef>")

"""
<siri:Lines>
#{line_refs}
</siri:Lines>
"""
end

def line_refs_element([] = _line_refs), do: nil

def line_refs_element(line_refs) do
line_refs = line_refs |> Enum.map(&element("siri:LineRef", [], &1))
element("siri:Lines", [], line_refs)
line_refs = Enum.map(line_refs, &element("siri:LineRef", [], &1))

element("siri:Lines", [], [
element("siri:LineDirection", [], line_refs)
])
end

def append_if_not_nil(list, nil), do: list
Expand Down
6 changes: 4 additions & 2 deletions apps/transport/test/transport/siri_queries_test.exs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,10 @@ defmodule Transport.SIRITest do
<siri:RequestTimestamp>#{timestamp}</siri:RequestTimestamp>
<siri:MessageIdentifier>#{message_identifier}</siri:MessageIdentifier>
<siri:Lines>
<siri:LineRef>#{line_001}</siri:LineRef>
<siri:LineRef>#{line_002}</siri:LineRef>
<siri:LineDirection>
<siri:LineRef>#{line_001}</siri:LineRef>
<siri:LineRef>#{line_002}</siri:LineRef>
</siri:LineDirection>
</siri:Lines>
</Request>
<RequestExtension/>
Expand Down