-
Notifications
You must be signed in to change notification settings - Fork 22
Adding PublishToAudioAction to SIRI-SX #210
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.
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
Open
TuThoThai
wants to merge
13
commits into
v2.3-wip
Choose a base branch
from
sx_cr_audiomessage
base: v2.3-wip
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
407f5f8
Enhancing ActionData
TuThoThai 1eeadf6
Re-work extension of ActionData
TuThoThai aeea607
Merge branch 'v2.3-wip' into sx_cr_actiondata_enhancement
TuThoThai 3ce1abd
Delete examples/siri_exm_SX/exm_situationExchange_responsewithprompta…
TuThoThai 0cac8d4
adding PublishToAudioAction
TuThoThai 7ffbe5c
adding language attribute to the URL
TuThoThai ba913b2
Apply suggestion from @skinkie
TuThoThai 079edae
Add example, fix attributes
TuThoThai 631f304
addition of AudioURI type
TuThoThai 63e0987
edit example
TuThoThai 0ae1dba
change attribute of Url
TuThoThai cd68d85
edits based on review
TuThoThai b26631e
Add PublishToAudioAction
TuThoThai File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
126 changes: 126 additions & 0 deletions
126
examples/siri_exm_SX/exx_situationExchange_response_extended.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,126 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- (C) Copyright 2005-2012 CEN SIRI --> | ||
| <Siri xmlns="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:d2="http://datex2.eu/schema/2_0RC1/2_0" version="2.0" xsi:schemaLocation="http://www.siri.org.uk/siri ../../xsd/siri.xsd"> | ||
| <ServiceDelivery> | ||
| <!--=======HEADER================================================== --> | ||
| <ResponseTimestamp>2026-05-17T16:00:26+01:00</ResponseTimestamp> | ||
| <ProducerRef>GT7</ProducerRef> | ||
| <Status>true</Status> | ||
| <MoreData>false</MoreData> | ||
| <!--=======PAYLOAD============================================== --> | ||
| <SituationExchangeDelivery version="2.0"> | ||
| <ResponseTimestamp>2026-05-17T16:00:26+01:00</ResponseTimestamp> | ||
| <Situations> | ||
| <PtSituationElement> | ||
| <CreationTime>2026-05-17T16:00:00.0Z</CreationTime> | ||
| <CountryRef>fr</CountryRef> | ||
| <ParticipantRef>GT7</ParticipantRef> | ||
| <SituationNumber>123456</SituationNumber> | ||
| <Version>0</Version> | ||
| <References> | ||
| <RelatedToRef> | ||
| <CreationTime>2026-05-17T16:00:00</CreationTime> | ||
| <CountryRef>fr</CountryRef> | ||
| <ParticipantRef>GT7</ParticipantRef> | ||
| <SituationNumber>123456</SituationNumber> | ||
| <Version>0</Version> | ||
| </RelatedToRef> | ||
| </References> | ||
| <Source> | ||
| <Country>fr</Country> | ||
| <SourceType>directReport</SourceType> | ||
| <AgentReference>987654</AgentReference> | ||
| <TimeOfCommunication>2026-05-17T15:55:00.0Z</TimeOfCommunication> | ||
| </Source> | ||
| <Verification>verified</Verification> | ||
| <Progress>open</Progress> | ||
| <QualityIndex>certain</QualityIndex> | ||
| <ValidityPeriod> | ||
| <StartTime>2026-05-17T16:00:00.0Z</StartTime> | ||
| <EndTime>2026-05-17T17:30:00.0Z</EndTime> | ||
| </ValidityPeriod> | ||
| <AlertCause>unattendedBag</AlertCause> | ||
| <Severity>slight</Severity> | ||
| <Priority>5</Priority> | ||
| <Audience>public</Audience> | ||
| <ReportType>point</ReportType> | ||
| <Summary xml:lang="fr">Bagage oublié à la station Rome</Summary> | ||
| <Description xml:lang="fr">Bagage oublié à la station Rome. Service temporairement interrompu.</Description> | ||
| <Affects> | ||
| <Operators> | ||
| <AllOperators/> | ||
| </Operators> | ||
| <StopPoints> | ||
| <AffectedStopPoint> | ||
| <StopPointRef>ROM123SSP</StopPointRef> | ||
| <StopPointName xml:lang="fr">Rome</StopPointName> | ||
| </AffectedStopPoint> | ||
| </StopPoints> | ||
| <StopPlaces> | ||
| <AffectedStopPlace> | ||
| <StopPlaceRef>ROM123SP</StopPlaceRef> | ||
| <StopPlaceName xml:lang="FR">Rome</StopPlaceName> | ||
| <StopPlaceType>metroStation</StopPlaceType> | ||
| </AffectedStopPlace> | ||
| </StopPlaces> | ||
| </Affects> | ||
| <Consequences> | ||
| <Consequence> | ||
| <Period> | ||
| <StartTime>2026-05-17T16:00:00.0Z</StartTime> | ||
| <EndTime>2026-05-17T17:30:00.0Z</EndTime> | ||
| </Period> | ||
| <Condition>disruption</Condition> | ||
| <Severity>slight</Severity> | ||
| <Blocking> | ||
| <JourneyPlanner>true</JourneyPlanner> | ||
| <RealTime>true</RealTime> | ||
| </Blocking> | ||
| <Boarding> | ||
| <ArrivalBoardingActivity>noAlighting</ArrivalBoardingActivity> | ||
| <DepartureBoardingActivity>noBoarding</DepartureBoardingActivity> | ||
| </Boarding> | ||
| </Consequence> | ||
| </Consequences> | ||
| <PublishingActions> | ||
| <PublishToWebAction> | ||
| <ActionData> | ||
| <Type>ShortText</Type> | ||
| <Prompt>Babage oublié à Rome. Service interrompu jusqu'à 17h30.</Prompt> | ||
| </ActionData> | ||
| <Incidents>true</Incidents> | ||
| <HomePage>true</HomePage> | ||
| <Ticker>false</Ticker> | ||
| </PublishToWebAction> | ||
| <PublishToWebAction> | ||
| <ActionData> | ||
| <Type>image</Type> | ||
| <Url contentType="image/png" label="deviation_map">https://mediabank.aom.fr/images/perturbations/devation_map.png</Url> | ||
| </ActionData> | ||
| <HomePage>true</HomePage> | ||
| </PublishToWebAction> | ||
| <PublishToMobileAction> | ||
| <ActionData> | ||
| <Type>ShortText</Type> | ||
| <Prompt xml:lang="fr">Babage oublié à Rome. Service interrompu jusqu'à 17h30.</Prompt> | ||
| <Prompt xml:lang="en">Unattended bag at Rome station. Disruption of service until 17:30.</Prompt> | ||
| </ActionData> | ||
| <Incidents>true</Incidents> | ||
| <HomePage>false</HomePage> | ||
| </PublishToMobileAction> | ||
| <PublishToDisplayAction> | ||
| <ActionData> | ||
| <Type>ShortText</Type> | ||
| <Prompt contentType="text/plain" xml:lang="fr">Babage oublié à Rome. Service interrompu jusqu'à 17h30.</Prompt> | ||
| <Prompt contentType="text/markdown" xml:lang="fr">Babage oublié à Rome. **Service interrompu jusqu'à 17h30**.</Prompt> | ||
| <Prompt contentType="text/plain" xml:lang="en">Unattended bag at Rome station. Disruption of service until 17:30.</Prompt> | ||
| <Prompt contentType="text/markdown" xml:lang="en">Unattended bag at Rome station. **Disruption of service until 17:30**.</Prompt> | ||
| </ActionData> | ||
| <OnPlace>true</OnPlace> | ||
| </PublishToDisplayAction> | ||
| </PublishingActions> | ||
| </PtSituationElement> | ||
| </Situations> | ||
| </SituationExchangeDelivery> | ||
| </ServiceDelivery> | ||
| </Siri> |
127 changes: 127 additions & 0 deletions
127
examples/siri_exm_SX/exx_situationExchange_responsewithaudio.xml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,127 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!-- (C) Copyright 2005-2012 CEN SIRI --> | ||
| <Siri xmlns="http://www.siri.org.uk/siri" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:d2="http://datex2.eu/schema/2_0RC1/2_0" version="2.0" xsi:schemaLocation="http://www.siri.org.uk/siri ../../xsd/siri.xsd"> | ||
| <ServiceDelivery> | ||
| <!--=======HEADER================================================== --> | ||
| <ResponseTimestamp>2026-05-17T16:00:26+01:00</ResponseTimestamp> | ||
| <ProducerRef>GT7</ProducerRef> | ||
| <Status>true</Status> | ||
| <MoreData>false</MoreData> | ||
| <!--=======PAYLOAD============================================== --> | ||
| <SituationExchangeDelivery version="2.0"> | ||
| <ResponseTimestamp>2026-05-17T16:00:26+01:00</ResponseTimestamp> | ||
| <Situations> | ||
| <PtSituationElement> | ||
| <CreationTime>2026-05-17T16:00:00.0Z</CreationTime> | ||
| <CountryRef>fr</CountryRef> | ||
| <ParticipantRef>GT7</ParticipantRef> | ||
| <SituationNumber>123456</SituationNumber> | ||
| <Version>0</Version> | ||
| <References> | ||
| <RelatedToRef> | ||
| <CreationTime>2026-05-17T16:00:00</CreationTime> | ||
| <CountryRef>fr</CountryRef> | ||
| <ParticipantRef>GT7</ParticipantRef> | ||
| <SituationNumber>123456</SituationNumber> | ||
| <Version>0</Version> | ||
| </RelatedToRef> | ||
| </References> | ||
| <Source> | ||
| <Country>fr</Country> | ||
| <SourceType>directReport</SourceType> | ||
| <AgentReference>987654</AgentReference> | ||
| <TimeOfCommunication>2026-05-17T15:55:00.0Z</TimeOfCommunication> | ||
| </Source> | ||
| <Verification>verified</Verification> | ||
| <Progress>open</Progress> | ||
| <QualityIndex>certain</QualityIndex> | ||
| <ValidityPeriod> | ||
| <StartTime>2026-05-17T16:00:00.0Z</StartTime> | ||
| <EndTime>2026-05-17T17:30:00.0Z</EndTime> | ||
| </ValidityPeriod> | ||
| <AlertCause>unattendedBag</AlertCause> | ||
| <Severity>slight</Severity> | ||
| <Priority>5</Priority> | ||
| <Audience>public</Audience> | ||
| <ReportType>point</ReportType> | ||
| <Summary xml:lang="fr">Bagage oublié à la station Rome</Summary> | ||
| <Description xml:lang="fr">Bagage oublié à la station Rome. Service temporairement interrompu.</Description> | ||
| <Affects> | ||
| <Operators> | ||
| <AllOperators/> | ||
| </Operators> | ||
| <StopPoints> | ||
| <AffectedStopPoint> | ||
| <StopPointRef>ROM123SSP</StopPointRef> | ||
| <StopPointName xml:lang="fr">Rome</StopPointName> | ||
| </AffectedStopPoint> | ||
| </StopPoints> | ||
| <StopPlaces> | ||
| <AffectedStopPlace> | ||
| <StopPlaceRef>ROM123SP</StopPlaceRef> | ||
| <StopPlaceName xml:lang="FR">Rome</StopPlaceName> | ||
| <StopPlaceType>metroStation</StopPlaceType> | ||
| </AffectedStopPlace> | ||
| </StopPlaces> | ||
| </Affects> | ||
| <Consequences> | ||
| <Consequence> | ||
| <Period> | ||
| <StartTime>2026-05-17T16:00:00.0Z</StartTime> | ||
| <EndTime>2026-05-17T17:30:00.0Z</EndTime> | ||
| </Period> | ||
| <Condition>disruption</Condition> | ||
| <Severity>slight</Severity> | ||
| <Blocking> | ||
| <JourneyPlanner>true</JourneyPlanner> | ||
| <RealTime>true</RealTime> | ||
| </Blocking> | ||
| <Boarding> | ||
| <ArrivalBoardingActivity>noAlighting</ArrivalBoardingActivity> | ||
| <DepartureBoardingActivity>noBoarding</DepartureBoardingActivity> | ||
| </Boarding> | ||
| </Consequence> | ||
| </Consequences> | ||
| <PublishingActions> | ||
| <PublishToWebAction> | ||
| <ActionData> | ||
| <Type>ShortText</Type> | ||
| <Prompt xml:lang="fr">Babage oublié à Rome. Service interrompu jusqu'à 17h30.</Prompt> | ||
| <Prompt xml:lang="en">Unattended bag at Rome station. Disruption of service until 17:30.</Prompt> | ||
| </ActionData> | ||
| <Incidents>true</Incidents> | ||
| <HomePage>true</HomePage> | ||
| <Ticker>false</Ticker> | ||
| </PublishToWebAction> | ||
| <PublishToMobileAction> | ||
| <ActionData> | ||
| <Type>ShortText</Type> | ||
| <Prompt xml:lang="fr">Babage oublié à Rome. Service interrompu jusqu'à 17h30.</Prompt> | ||
| <Prompt xml:lang="en">Unattended bag at Rome station. Disruption of service until 17:30.</Prompt> | ||
| </ActionData> | ||
| <Incidents>true</Incidents> | ||
| <HomePage>false</HomePage> | ||
| </PublishToMobileAction> | ||
| <PublishToDisplayAction> | ||
| <ActionData> | ||
| <Type>ShortText</Type> | ||
| <Prompt xml:lang="fr">Babage oublié à Rome. Service interrompu jusqu'à 17h30.</Prompt> | ||
| <Prompt xml:lang="en">Unattended bag at Rome station. Disruption of service until 17:30.</Prompt> | ||
| </ActionData> | ||
| <OnPlace>true</OnPlace> | ||
| </PublishToDisplayAction> | ||
| <PublishToAudioAction> | ||
| <ActionData> | ||
| <Type>RecordedMessage</Type> | ||
| <Url contentType="audio/mp4" xml:lang="fr">http://mediabank.aom.fr/audio/unattended_bag_fr.mp4</Url> | ||
| <Url contentType="audio/mp4" xml:lang="en">http://mediabank.aom.fr/audio/unattended_bag_en.mp4</Url> | ||
| </ActionData> | ||
| <Repeat>true</Repeat> | ||
| <RepeatInterval>3</RepeatInterval> | ||
| </PublishToAudioAction> | ||
| </PublishingActions> | ||
| </PtSituationElement> | ||
| </Situations> | ||
| </SituationExchangeDelivery> | ||
| </ServiceDelivery> | ||
| </Siri> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
My proposal would still be to have the Url inside the ActionData. So it would look like analogue to the Prompts.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
But, then it means we add it to all the Actions in
ActionsGroupthat are based onParametrisedActionStructure. I am not against it, but wouldn't it be redundant forPublishToWebActionorPublishToMobileAction?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually it would support publishing other media like images too. Hence I thought that was your goal for the République française!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@skinkie, I addressed the comment in PR #221
If we can agree on that, I will rework this one to streamline
PublishToAudioActionto attributes that are specific to an audio message.