diff --git a/docs/generated/contab/siri.html b/docs/generated/contab/siri.html index 844c94f7..2c83bc20 100644 --- a/docs/generated/contab/siri.html +++ b/docs/generated/contab/siri.html @@ -5010,11 +5010,19 @@

OJP - Open API for distributed Journey Planning (SIRI)

48.1. Simple type definitions
  • - 48.2 The complexType siri:NaturalLanguagePlaceNameStructure + 48.2 The complexType siri:ContentUriStructure
  • - 48.3 The complexType siri:NaturalLanguageStringStructure + 48.3 The complexType siri:NaturalLanguagePlaceNameStructure + +
    • +
  • + 48.4 The complexType siri:NaturalLanguageStringStructure + +
    • +
  • + 48.5 The complexType siri:PromptType
    • @@ -196620,12 +196628,36 @@

    28.16. The complex type siri:ActionDataStructure

    - >siri:NaturalLanguageStringStructure + >siri:PromptType

    -

    Display prompt for presenting action to user. (Unbounded since SIRI 2.0)

    +

    Display prompt for presenting action to user. (Unbounded since SIRI 2.0). Possibility to add attributes on the type of prompt and its language. There must be only one instanciation of any given combination between PromptType and lang (i.e., only one content for a plain text in English, one content for plain text in French, one for plain text in German, etc.)(+v2.3)

    + + + + + + + +

    + siri:Url +

    + + +

    + 0:* +

    + + +

    + >siri:ContentUriStructure + +

    + + +

    Direct link to the content to be published or broadcasted as is (e.g., pre-recorded message, image, video, etc.). There must be only one instanciation of a any given combination between contentType and lang (i.e., only one content for a plain text in English, one content for plain text in French, one for plain text in German, etc.)(+v2.3)

    @@ -253893,6 +253925,134 @@

    48.1. Simple type definitions

    + + +

    + + siri:ContentTypeEnumeration + +

    + + +

    Allowed values for contentType attribute (+v2.3)

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +

    text/plain

    +     		+

    Plain text

    +
    +

    text/html

    +     		+

    HTML text

    +
    +

    text/markdown

    +     		+

    Markdown text

    +
    +

    audio/aac

    +     		+

    AAC audio file

    +
    +

    audio/mpeg

    +     		+

    MPEG audio file (e.g., mp3)

    +
    +

    audio/mp4

    +     		+

    MP4 audio file

    +
    +

    audio/ogg

    +     		+

    OGG audio file

    +
    +

    image/gif

    +     		+

    GIF image file

    +
    +

    image/jpeg

    +     		+

    JPEG image file

    +
    +

    image/png

    +     		+

    PNG image file

    +
    +

    video/mp4

    +     		+

    MP4 video file

    +
    +

    video/mpeg

    +     		+

    MPEG video file

    +
    +

    video/ogg

    +     		+

    OGG video file

    +
    + +

    @@ -254094,8 +254254,131 @@

    48.1. Simple type definitions

    +
    +

    48.15. The complex type siri:ContentUriStructure +

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +

    + siri:ContentUriStructure +

    +     		+

    + xs:anyURI +

    +     		+

    -

    +
    +

    Inherited content is followed by own content:

    +
    + + +

    + + @contentType + +

    +     		+

    + + 1:1 + +

    +     		+

    + + siri:ContentTypeEnumeration + +

    +     		+

    Specifies the media type of the resource that the link points to.

    +
    + + +

    + + @xml:lang + +

    +     		+

    + + 1:1 + +

    +     		+

    + + + +

    +     		+

    If the content of the resource is in a single language, specifies which one. There should be only one instanciation of a any given combination between contentType and lang (i.e., only one content for a plain text in English, one content for plain text in French, one for plain text in German, etc.) lang (as an attribute name) denotes an attribute whose value is a language code for the natural language of the content of any element; its value is inherited. This name is reserved by virtue of its definition in the XML specification. Notes Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never going to be a realistic possibility. See BCP 47 at http://www.rfc-editor.org/rfc/bcp/bcp47.txt and the IANA language subtag registry at http://www.iana.org/assignments/language-subtag-registry for further information. The union allows for the 'un-declaration' of xml:lang with the empty string.

    +
    + + +

    + + @label + +

    +     		+

    + + 1:1 + +

    +     		+

    + xs:string +

    +     		+

    Gives additional information on the resource that the link points to (e.g., recorded message, image, video, etc.).

    +
    +
    +
    -

    48.14. The complex type siri:NaturalLanguagePlaceNameStructure +

    48.16. The complex type siri:NaturalLanguagePlaceNameStructure

    @@ -254162,7 +254445,7 @@

    48.14. The complex type siri:NaturalLanguagePlaceNameStructure
    -

    48.15. The complex type siri:NaturalLanguageStringStructure +

    48.17. The complex type siri:NaturalLanguageStringStructure

    @@ -254228,6 +254511,107 @@

    48.15. The complex type siri:NaturalLanguageStringStructure

    +
    +

    48.18. The complex type siri:PromptType +

    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +

    + siri:PromptType +

    +     		+

    + siri:NaturalLanguageStringStructure +

    +     		+

    A restriction of W3C XML Schema's string that requires at least one character of text.

    +
    +

    The element content starts with items inherited from the base type:

    +
    + + +

    + + @xml:lang + +

    +     		+

    + + 1:1 + +

    +     		+

    + + + +

    +     		+

    lang (as an attribute name) denotes an attribute whose value is a language code for the natural language of the content of any element; its value is inherited. This name is reserved by virtue of its definition in the XML specification. Notes Attempting to install the relevant ISO 2- and 3-letter codes as the enumerated possible values is probably never going to be a realistic possibility. See BCP 47 at http://www.rfc-editor.org/rfc/bcp/bcp47.txt and the IANA language subtag registry at http://www.iana.org/assignments/language-subtag-registry for further information. The union allows for the 'un-declaration' of xml:lang with the empty string.

    +
    +

    Inherited content is followed by own content:

    +
    + + +

    + + @contentType + +

    +     		+

    + + 1:1 + +

    +     		+

    + + siri:ContentTypeEnumeration + +

    +     		+

    Specifies the type of the Prompt, to be used when it is not plain text (which is the value per default).

    +
    +
    +

    49. siri_utility.xsd

    diff --git a/examples/siri_exm_SX/exx_situationExchange_response_extended.xml b/examples/siri_exm_SX/exx_situationExchange_response_extended.xml new file mode 100644 index 00000000..c4bb518a --- /dev/null +++ b/examples/siri_exm_SX/exx_situationExchange_response_extended.xml @@ -0,0 +1,126 @@ + + + + + + 2026-05-17T16:00:26+01:00 + GT7 + true + false + + + 2026-05-17T16:00:26+01:00 + + + 2026-05-17T16:00:00.0Z + fr + GT7 + 123456 + 0 + + + 2026-05-17T16:00:00 + fr + GT7 + 123456 + 0 + + + + fr + directReport + 987654 + 2026-05-17T15:55:00.0Z + + verified + open + certain + + 2026-05-17T16:00:00.0Z + 2026-05-17T17:30:00.0Z + + unattendedBag + slight + 5 + public + point + Bagage oublié à la station Rome + Bagage oublié à la station Rome. Service temporairement interrompu. + + + + + + + ROM123SSP + Rome + + + + + ROM123SP + Rome + metroStation + + + + + + + 2026-05-17T16:00:00.0Z + 2026-05-17T17:30:00.0Z + + disruption + slight + + true + true + + + noAlighting + noBoarding + + + + + + + ShortText + Babage oublié à Rome. Service interrompu jusqu'à 17h30. + + true + true + false + + + + image + https://mediabank.aom.fr/images/perturbations/devation_map.png + + true + + + + ShortText + Babage oublié à Rome. Service interrompu jusqu'à 17h30. + Unattended bag at Rome station. Disruption of service until 17:30. + + true + false + + + + ShortText + Babage oublié à Rome. Service interrompu jusqu'à 17h30. + Unattended bag at Rome station. Disruption of service until 17:30. + Babage oublié à Rome. **Service interrompu jusqu'à 17h30**. + Unattended bag at Rome station. **Disruption of service until 17:30**. + + true + + + + + + + diff --git a/xsd/siri_model/siri_situationActions.xsd b/xsd/siri_model/siri_situationActions.xsd index 09ba667d..f99c28b4 100644 --- a/xsd/siri_model/siri_situationActions.xsd +++ b/xsd/siri_model/siri_situationActions.xsd @@ -28,6 +28,11 @@ - because ParameterisedActionStructure is base of PassengerInformationAction, PublicationWindow replaces there the ActionValidityPeriod of version Siri_XML-2.0p_a0.4, which had wrongly not the name PublicationWindow - because ParameterisedActionStructure is base of all PublishTo...-structures, PublicationWindow is now automatically also available there - ScopeType renamed to Perspective with new enumeration "general" / "stopPoint" / "vehicleJourney" +02.10.2026 SIRI-SX task force: +- Addition of links between Consequences and Actions +- Change of cardinality for elements in ActionDataStructure +- Addition of attributes to Prompt in ActionDataStructure +- Addition of URL in ActionDataStructure --> @@ -228,14 +233,19 @@ Rail transport, Roads and road transport Data type of action data. - + Value for action. - + - Display prompt for presenting action to user. (Unbounded since SIRI 2.0) + Display prompt for presenting action to user. (Unbounded since SIRI 2.0). Possibility to add attributes on the type of prompt and its language. There must be only one instanciation of any given combination between PromptType and lang (i.e., only one content for a plain text in English, one content for plain text in French, one for plain text in German, etc.)(+v2.3) + + + + + Direct link to the content to be published or broadcasted as is (e.g., pre-recorded message, image, video, etc.). There must be only one instanciation of a any given combination between contentType and lang (i.e., only one content for a plain text in English, one content for plain text in French, one for plain text in German, etc.)(+v2.3) diff --git a/xsd/siri_utility/siri_types.xsd b/xsd/siri_utility/siri_types.xsd index 4dfd2199..3419ff2d 100644 --- a/xsd/siri_utility/siri_types.xsd +++ b/xsd/siri_utility/siri_types.xsd @@ -166,4 +166,116 @@ The value range is normally 0-100, but could in some circumstances go beyond 100 + + + Allow the addition of attributes in a Prompt to add further details about its content. There must be only one instanciation of a any given combination between contentType and lang (i.e., only one content for a plain text in English, one content for plain text in French, one for plain text in German, etc.) + + + + + + Specifies the type of the Prompt, to be used when it is not plain text (which is the value per default). + + + + + + + + Details further the type of content that the link points to. +v2.3 + + + + + + Specifies the media type of the resource that the link points to. + + + + + If the content of the resource is in a single language, specifies which one. + There should be only one instanciation of a any given combination between contentType and lang + (i.e., only one content for a plain text in English, one content for plain text in French, one for plain text in German, etc.) + + + + + Gives additional information on the resource that the link points to (e.g., recorded message, image, video, etc.). + + + + + + + + Allowed values for contentType attribute (+v2.3) + + + + + Plain text + + + + + HTML text + + + + + Markdown text + + + + + AAC audio file + + + + + MPEG audio file (e.g., mp3) + + + + + MP4 audio file + + + + + OGG audio file + + + + + GIF image file + + + + + JPEG image file + + + + + PNG image file + + + + + MP4 video file + + + + + MPEG video file + + + + + OGG video file + + + +